Rename NetLogLogger and CapturingNetLog

net/websockets/websocket_basic_stream_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Tests for WebSocketBasicStream. Note that we do not attempt to verify that
 // frame parsing itself functions correctly, as that is covered by the
 // WebSocketFrameParser tests.
 
 #include "net/websockets/websocket_basic_stream.h"
 
 #include <string.h>  // for memcpy() and memset().
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/big_endian.h"
 #include "base/port.h"
 #include "net/base/test_completion_callback.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace {
 
 #define WEBSOCKET_BASIC_STREAM_TEST_DEFINE_CONSTANT(name, value) \
   const char k##name[] = value;                                  \
   const size_t k##name##Size = arraysize(k##name) - 1;
 
@@ skipping 38 matching lines @@
 WebSocketMaskingKey GenerateNulMaskingKey() { return kNulMaskingKey; }
 
 // A masking key generation function which generates a fixed masking key with no
 // nul characters.
 WebSocketMaskingKey GenerateNonNulMaskingKey() { return kNonNulMaskingKey; }
 
 // Base class for WebSocketBasicStream test fixtures.
 class WebSocketBasicStreamTest : public ::testing::Test {
  protected:
   scoped_ptr<WebSocketBasicStream> stream_;
-  CapturingNetLog net_log_;
+  TestNetLog net_log_;
 };
 
 // A subclass of StaticSocketDataProvider modified to require that all data
 // expected to be read or written actually is.
 class StrictStaticSocketDataProvider : public StaticSocketDataProvider {
  public:
   StrictStaticSocketDataProvider(MockRead* reads,
                                  size_t reads_count,
                                  MockWrite* writes,
                                  size_t writes_count,
@@ skipping 68 matching lines @@
   template <size_t N>
   void CreateReadOnly(MockRead (&reads)[N]) {
     CreateStream(reads, N, NULL, 0);
   }
 
   void CreateNullStream() { CreateStream(NULL, 0, NULL, 0); }
 
   scoped_ptr<SocketDataProvider> socket_data_;
   MockClientSocketFactory factory_;
   MockTransportClientSocketPool pool_;
-  CapturingBoundNetLog(bound_net_log_);
+  BoundTestNetLog(bound_net_log_);
   ScopedVector<WebSocketFrame> frames_;
   TestCompletionCallback cb_;
   scoped_refptr<GrowableIOBuffer> http_read_buffer_;
   std::string sub_protocol_;
   std::string extensions_;
   WebSocketBasicStream::WebSocketMaskingKeyGeneratorFunction generator_;
   bool expect_all_io_to_complete_;
 };
 
 // A test fixture for the common case of tests that only perform a single read.
@@ skipping 756 matching lines @@
 
 TEST_F(WebSocketBasicStreamSocketTest, GetSubProtocolWorks) {
   sub_protocol_ = "cyberchat";
   CreateNullStream();
 
   EXPECT_EQ("cyberchat", stream_->GetSubProtocol());
 }
 
 }  // namespace
 }  // namespace net