diff options
Diffstat (limited to 'chromium/net/websockets/websocket_frame_test.cc')
| -rw-r--r-- | chromium/net/websockets/websocket_frame_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/websockets/websocket_frame_test.cc b/chromium/net/websockets/websocket_frame_test.cc index 97fac03e12e..b37dbb33001 100644 --- a/chromium/net/websockets/websocket_frame_test.cc +++ b/chromium/net/websockets/websocket_frame_test.cc @@ -308,7 +308,7 @@ TEST(WebSocketFrameTest, MaskPayloadAlignment) { }; COMPILE_ASSERT(arraysize(kTestInput) == arraysize(kTestOutput), output_and_input_arrays_have_the_same_length); - scoped_ptr_malloc<char, base::ScopedPtrAlignedFree> scratch( + scoped_ptr<char, base::AlignedFreeDeleter> scratch( static_cast<char*>( base::AlignedAlloc(kScratchBufferSize, kMaxVectorAlignment))); WebSocketMaskingKey masking_key; @@ -348,7 +348,7 @@ class WebSocketFrameTestMaskBenchmark : public testing::Test { virtual void SetUp() { std::string iterations( - CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( kBenchmarkIterations)); int benchmark_iterations = 0; if (!iterations.empty() && |