net: rename BoundNetLog to NetLogWithSource

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"
 
@@ skipping 116 matching lines @@
                                                           MockWrite writes[],
                                                           size_t writes_count) {
     socket_data_.reset(new StrictStaticSocketDataProvider(
         reads, reads_count, writes, writes_count, expect_all_io_to_complete_));
     socket_data_->set_connect_data(MockConnect(SYNCHRONOUS, OK));
     factory_.AddSocketDataProvider(socket_data_.get());
 
     std::unique_ptr<ClientSocketHandle> transport_socket(
         new ClientSocketHandle);
     scoped_refptr<MockTransportSocketParams> params;
-    transport_socket->Init(
-        "a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
-        CompletionCallback(), &pool_, bound_net_log_.bound());
+    transport_socket->Init("a", params, MEDIUM,
+                           ClientSocketPool::RespectLimits::ENABLED,
+                           CompletionCallback(), &pool_, net_log_.bound());
     return transport_socket;
   }
 
   void SetHttpReadBuffer(const char* data, size_t size) {
     http_read_buffer_ = new GrowableIOBuffer;
     http_read_buffer_->SetCapacity(size);
     memcpy(http_read_buffer_->data(), data, size);
     http_read_buffer_->set_offset(size);
   }
 
@@ skipping 12 matching lines @@
   template <size_t N>
   void CreateReadOnly(MockRead (&reads)[N]) {
     CreateStream(reads, N, NULL, 0);
   }
 
   void CreateNullStream() { CreateStream(NULL, 0, NULL, 0); }
 
   std::unique_ptr<SocketDataProvider> socket_data_;
   MockClientSocketFactory factory_;
   MockTransportClientSocketPool pool_;
-  BoundTestNetLog(bound_net_log_);
+  BoundTestNetLog(net_log_);
   std::vector<std::unique_ptr<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 781 matching lines @@
 
 TEST_F(WebSocketBasicStreamSocketTest, GetSubProtocolWorks) {
   sub_protocol_ = "cyberchat";
   CreateNullStream();
 
   EXPECT_EQ("cyberchat", stream_->GetSubProtocol());
 }
 
 }  // namespace
 }  // namespace net