net: rename BoundNetLog to NetLogWithSource

Patch generated by the following command line:

$ g grep -l BoundNetLog | xargs perl -pi -e 's/BoundNetLog/NetLogWithSource/g'

BUG=475260
TEST=net_unittests
R=eroman@chromium.org
TBR=dtrainor,thestig,oshima,sdefresne,avi,rockot,rogerta,sergeyu

Review-Url: https://codereview.chromium.org/2351513002
Cr-Commit-Position: refs/heads/master@{#420320}

blimp/net/exact_match_cert_verifier.cc

@@ -33,7 +33,7 @@ int ExactMatchCertVerifier::Verify(const RequestParams& params,
                                    net::CertVerifyResult* verify_result,
                                    const net::CompletionCallback& callback,
                                    std::unique_ptr<Request>* out_req,
-                                   const net::BoundNetLog& net_log) {
+                                   const net::NetLogWithSource& net_log) {
   verify_result->Reset();
   verify_result->verified_cert = engine_cert_;
 

blimp/net/exact_match_cert_verifier.h

@@ -33,7 +33,7 @@ class BLIMP_NET_EXPORT ExactMatchCertVerifier : public net::CertVerifier {
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
              std::unique_ptr<Request>* out_req,
-             const net::BoundNetLog& net_log) override;
+             const net::NetLogWithSource& net_log) override;
 
  private:
   scoped_refptr<net::X509Certificate> engine_cert_;

blimp/net/test_common.h

@@ -118,7 +118,7 @@ class MockStreamSocket : public net::StreamSocket {
   MOCK_CONST_METHOD0(IsConnectedAndIdle, bool());
   MOCK_CONST_METHOD1(GetPeerAddress, int(net::IPEndPoint*));
   MOCK_CONST_METHOD1(GetLocalAddress, int(net::IPEndPoint*));
-  MOCK_CONST_METHOD0(NetLog, const net::BoundNetLog&());
+  MOCK_CONST_METHOD0(NetLog, const net::NetLogWithSource&());
   MOCK_METHOD0(SetSubresourceSpeculation, void());
   MOCK_METHOD0(SetOmniboxSpeculation, void());
   MOCK_CONST_METHOD0(WasEverUsed, bool());

chrome/browser/chromeos/policy/policy_cert_verifier.cc

@@ -74,7 +74,7 @@ int PolicyCertVerifier::Verify(
     net::CertVerifyResult* verify_result,
     const net::CompletionCallback& completion_callback,
     std::unique_ptr<Request>* out_req,
-    const net::BoundNetLog& net_log) {
+    const net::NetLogWithSource& net_log) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(delegate_);
   net::CompletionCallback wrapped_callback =

chrome/browser/chromeos/policy/policy_cert_verifier.h

@@ -50,7 +50,7 @@ class PolicyCertVerifier : public net::CertVerifier {
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
              std::unique_ptr<Request>* out_req,
-             const net::BoundNetLog& net_log) override;
+             const net::NetLogWithSource& net_log) override;
 
   bool SupportsOCSPStapling() override;
 

chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

@@ -75,7 +75,7 @@ class PolicyCertVerifierTest : public testing::Test {
                                       std::string(), net::CertificateList()),
                                   nullptr, verify_result,
                                   test_callback.callback(), request,
-                                  net::BoundNetLog());
+                                  net::NetLogWithSource());
   }
 
   bool SupportsAdditionalTrustAnchors() {

chrome/browser/devtools/device/port_forwarding_controller.cc

@@ -69,7 +69,7 @@ class SocketTunnel : public base::NonThreadSafe {
     int result = host_resolver_->Resolve(
         request_info, net::DEFAULT_PRIORITY, &address_list_,
         base::Bind(&SocketTunnel::OnResolved, base::Unretained(this)),
-        &request_, net::BoundNetLog());
+        &request_, net::NetLogWithSource());
     if (result != net::ERR_IO_PENDING)
       OnResolved(result);
   }

chrome/browser/devtools/device/tcp_device_provider.cc

@@ -40,7 +40,7 @@ class ResolveHostAndOpenSocket final {
         request_info, net::DEFAULT_PRIORITY, &address_list_,
         base::Bind(&ResolveHostAndOpenSocket::OnResolved,
                    base::Unretained(this)),
-        &request_, net::BoundNetLog());
+        &request_, net::NetLogWithSource());
     if (result != net::ERR_IO_PENDING)
       OnResolved(result);
   }

chrome/browser/devtools/device/usb/android_usb_socket.cc

@@ -201,7 +201,7 @@ int AndroidUsbSocket::GetLocalAddress(net::IPEndPoint* address) const {
   return net::ERR_NOT_IMPLEMENTED;
 }
 
-const net::BoundNetLog& AndroidUsbSocket::NetLog() const {
+const net::NetLogWithSource& AndroidUsbSocket::NetLog() const {
   return net_log_;
 }
 

chrome/browser/devtools/device/usb/android_usb_socket.h

@@ -47,7 +47,7 @@ class AndroidUsbSocket : public net::StreamSocket,
   bool IsConnectedAndIdle() const override;
   int GetPeerAddress(net::IPEndPoint* address) const override;
   int GetLocalAddress(net::IPEndPoint* address) const override;
-  const net::BoundNetLog& NetLog() const override;
+  const net::NetLogWithSource& NetLog() const override;
   void SetSubresourceSpeculation() override;
   void SetOmniboxSpeculation() override;
   bool WasEverUsed() const override;
@@ -68,7 +68,7 @@ class AndroidUsbSocket : public net::StreamSocket,
   std::string command_;
   uint32_t local_id_;
   uint32_t remote_id_;
-  net::BoundNetLog net_log_;
+  net::NetLogWithSource net_log_;
   bool is_connected_;
   std::string read_buffer_;
   scoped_refptr<net::IOBuffer> read_io_buffer_;

chrome/browser/devtools/devtools_network_controller_unittest.cc

@@ -94,8 +94,8 @@ class DevToolsNetworkControllerHelper {
       request_->upload_data_stream = upload_data_stream_.get();
     }
 
-    int rv = transaction_->Start(
-        request_.get(), completion_callback_, net::BoundNetLog());
+    int rv = transaction_->Start(request_.get(), completion_callback_,
+                                 net::NetLogWithSource());
     EXPECT_EQ(with_upload, !!transaction_->custom_upload_data_stream_);
     return rv;
   }
@@ -127,7 +127,7 @@ class DevToolsNetworkControllerHelper {
 
   int ReadUploadData() {
     EXPECT_EQ(net::OK, transaction_->custom_upload_data_stream_->Init(
-                           completion_callback_, net::BoundNetLog()));
+                           completion_callback_, net::NetLogWithSource()));
     return transaction_->custom_upload_data_stream_->Read(
         buffer_.get(), 64, completion_callback_);
   }

chrome/browser/devtools/devtools_network_transaction.cc

@@ -105,10 +105,9 @@ bool DevToolsNetworkTransaction::CheckFailed() {
   return false;
 }
 
-int DevToolsNetworkTransaction::Start(
-    const net::HttpRequestInfo* request,
-    const net::CompletionCallback& callback,
-    const net::BoundNetLog& net_log) {
+int DevToolsNetworkTransaction::Start(const net::HttpRequestInfo* request,
+                                      const net::CompletionCallback& callback,
+                                      const net::NetLogWithSource& net_log) {
   DCHECK(request);
   request_ = request;
 

chrome/browser/devtools/devtools_network_transaction.h

@@ -25,7 +25,7 @@ class GURL;
 
 namespace net {
 class AuthCredentials;
-class BoundNetLog;
+class NetLogWithSource;
 class HttpRequestHeaders;
 struct HttpRequestInfo;
 class HttpResponseInfo;
@@ -58,7 +58,7 @@ class DevToolsNetworkTransaction
   // HttpTransaction methods:
   int Start(const net::HttpRequestInfo* request,
             const net::CompletionCallback& callback,
-            const net::BoundNetLog& net_log) override;
+            const net::NetLogWithSource& net_log) override;
   int RestartIgnoringLastError(
       const net::CompletionCallback& callback) override;
   int RestartWithCertificate(net::X509Certificate* client_cert,

chrome/browser/devtools/devtools_network_upload_data_stream.cc

@@ -34,7 +34,7 @@ bool DevToolsNetworkUploadDataStream::IsInMemory() const {
 }
 
 int DevToolsNetworkUploadDataStream::InitInternal(
-    const net::BoundNetLog& net_log) {
+    const net::NetLogWithSource& net_log) {
   throttled_byte_count_ = 0;
   int result = upload_data_stream_->Init(
       base::Bind(&DevToolsNetworkUploadDataStream::StreamInitCallback,

chrome/browser/devtools/devtools_network_upload_data_stream.h

@@ -29,7 +29,7 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream {
  private:
   // net::UploadDataStream implementation.
   bool IsInMemory() const override;
-  int InitInternal(const net::BoundNetLog& net_log) override;
+  int InitInternal(const net::NetLogWithSource& net_log) override;
   int ReadInternal(net::IOBuffer* buf, int buf_len) override;
   void ResetInternal() override;
 

chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc

@@ -29,7 +29,7 @@ class PrivetV3ContextGetter::CertVerifier : public net::CertVerifier {
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
              std::unique_ptr<Request>* out_req,
-             const net::BoundNetLog& net_log) override {
+             const net::NetLogWithSource& net_log) override {
     verify_result->Reset();
     verify_result->verified_cert = params.certificate();
 

chrome/browser/extensions/api/platform_keys/verify_trust_api.cc

@@ -184,7 +184,7 @@ void VerifyTrustAPI::IOPart::Verify(std::unique_ptr<Params> params,
 
   std::unique_ptr<net::CertVerifyResult> verify_result(
       new net::CertVerifyResult);
-  std::unique_ptr<net::BoundNetLog> net_log(new net::BoundNetLog);
+  std::unique_ptr<net::NetLogWithSource> net_log(new net::NetLogWithSource);
   const int flags = 0;
 
   std::string ocsp_response;

chrome/browser/extensions/api/socket/mock_tcp_client_socket.h

@@ -26,7 +26,7 @@ class MockTCPClientSocket : public net::TCPClientSocket {
   MOCK_CONST_METHOD0(IsConnectedAndIdle, bool());
   MOCK_CONST_METHOD1(GetPeerAddress, int(net::IPEndPoint*));
   MOCK_CONST_METHOD1(GetLocalAddress, int(net::IPEndPoint*));
-  MOCK_CONST_METHOD0(NetLog, const net::BoundNetLog&());
+  MOCK_CONST_METHOD0(NetLog, const net::NetLogWithSource&());
   MOCK_METHOD0(SetSubresourceSpeculation, void());
   MOCK_METHOD0(SetOmniboxSpeculation, void());
   MOCK_CONST_METHOD0(WasEverUsed, bool());

chrome/browser/extensions/api/socket/tls_socket_unittest.cc

@@ -51,7 +51,7 @@ class MockSSLClientSocket : public net::SSLClientSocket {
   MOCK_CONST_METHOD0(IsConnectedAndIdle, bool());
   MOCK_CONST_METHOD1(GetPeerAddress, int(net::IPEndPoint*));
   MOCK_CONST_METHOD1(GetLocalAddress, int(net::IPEndPoint*));
-  MOCK_CONST_METHOD0(NetLog, const net::BoundNetLog&());
+  MOCK_CONST_METHOD0(NetLog, const net::NetLogWithSource&());
   MOCK_METHOD0(SetSubresourceSpeculation, void());
   MOCK_METHOD0(SetOmniboxSpeculation, void());
   MOCK_CONST_METHOD0(WasEverUsed, bool());

chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

@@ -1547,7 +1547,7 @@ TEST(ExtensionWebRequestHelpersTest, TestCalculateOnAuthRequiredDelta) {
 TEST(ExtensionWebRequestHelpersTest, TestMergeCancelOfResponses) {
   EventResponseDeltas deltas;
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   bool canceled = false;
 
   // Single event that does not cancel.
@@ -1573,7 +1573,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeCancelOfResponses) {
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) {
   EventResponseDeltas deltas;
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   GURL effective_new_url;
 
@@ -1654,7 +1654,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) {
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) {
   EventResponseDeltas deltas;
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   GURL effective_new_url;
 
@@ -1723,7 +1723,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) {
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses3) {
   EventResponseDeltas deltas;
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   GURL effective_new_url;
 
@@ -1759,7 +1759,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeSendHeadersResponses) {
   base_headers.SetHeader("key1", "value 1");
   base_headers.SetHeader("key2", "value 2");
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
   EventResponseDeltas deltas;
@@ -1855,7 +1855,7 @@ TEST(ExtensionWebRequestHelpersTest,
   base_headers.AddHeaderFromString(
       "Cookie: name=value; name2=value2; name3=\"value3\"");
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
   EventResponseDeltas deltas;
@@ -1939,7 +1939,7 @@ std::string GetCookieExpirationDate(int delta_secs) {
 TEST(ExtensionWebRequestHelpersTest,
      TestMergeCookiesInOnHeadersReceivedResponses) {
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
   EventResponseDeltas deltas;
@@ -2174,7 +2174,7 @@ TEST(ExtensionWebRequestHelpersTest,
 
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
   EventResponseDeltas deltas;
@@ -2274,7 +2274,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
 TEST(ExtensionWebRequestHelpersTest,
      TestMergeOnHeadersReceivedResponsesDeletion) {
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
   EventResponseDeltas deltas;
@@ -2328,7 +2328,7 @@ TEST(ExtensionWebRequestHelpersTest,
      TestMergeOnHeadersReceivedResponsesRedirect) {
   EventResponseDeltas deltas;
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
 
   char base_headers_string[] =
@@ -2381,7 +2381,7 @@ TEST(ExtensionWebRequestHelpersTest,
 
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnAuthRequiredResponses) {
   net::BoundTestNetLog capturing_net_log;
-  net::BoundNetLog net_log = capturing_net_log.bound();
+  net::NetLogWithSource net_log = capturing_net_log.bound();
   WarningSet warning_set;
   EventResponseDeltas deltas;
   base::string16 username = base::ASCIIToUTF16("foo");

chrome/browser/loader/safe_browsing_resource_throttle.cc

@@ -94,8 +94,9 @@ SafeBrowsingResourceThrottle::SafeBrowsingResourceThrottle(
       ui_manager_(sb_service->ui_manager()),
       request_(request),
       resource_type_(resource_type),
-      bound_net_log_(net::BoundNetLog::Make(request->net_log().net_log(),
-                                            NetLogSourceType::SAFE_BROWSING)) {}
+      net_log_with_source_(
+          net::NetLogWithSource::Make(request->net_log().net_log(),
+                                      NetLogSourceType::SAFE_BROWSING)) {}
 
 SafeBrowsingResourceThrottle::~SafeBrowsingResourceThrottle() {
   if (defer_state_ != DEFERRED_NONE) {
@@ -116,19 +117,19 @@ void SafeBrowsingResourceThrottle::BeginNetLogEvent(NetLogEventType type,
                                                     const GURL& url,
                                                     const char* name,
                                                     const char* value) {
-  bound_net_log_.BeginEvent(
+  net_log_with_source_.BeginEvent(
       type, base::Bind(&NetLogUrlCallback, request_, url, name, value));
   request_->net_log().AddEvent(
-      type, bound_net_log_.source().ToEventParametersCallback());
+      type, net_log_with_source_.source().ToEventParametersCallback());
 }
 
 void SafeBrowsingResourceThrottle::EndNetLogEvent(NetLogEventType type,
                                                   const char* name,
                                                   const char* value) {
-  bound_net_log_.EndEvent(
+  net_log_with_source_.EndEvent(
       type, base::Bind(&NetLogStringCallback, name, value));
   request_->net_log().AddEvent(
-      type, bound_net_log_.source().ToEventParametersCallback());
+      type, net_log_with_source_.source().ToEventParametersCallback());
 }
 
 void SafeBrowsingResourceThrottle::WillStartRequest(bool* defer) {

chrome/browser/loader/safe_browsing_resource_throttle.h

@@ -177,7 +177,7 @@ class SafeBrowsingResourceThrottle
   scoped_refptr<safe_browsing::SafeBrowsingUIManager> ui_manager_;
   const net::URLRequest* request_;
   const content::ResourceType resource_type_;
-  net::BoundNetLog bound_net_log_;
+  net::NetLogWithSource net_log_with_source_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingResourceThrottle);
 };

chrome/browser/net/dns_probe_runner.cc

@@ -21,13 +21,13 @@
 using base::TimeDelta;
 using content::BrowserThread;
 using net::AddressList;
-using net::BoundNetLog;
 using net::DnsClient;
 using net::DnsResponse;
 using net::DnsTransaction;
 using net::DnsTransactionFactory;
 using net::IPEndPoint;
 using net::NetLog;
+using net::NetLogWithSource;
 using net::NetworkChangeNotifier;
 
 namespace chrome_browser_net {
@@ -107,11 +107,10 @@ void DnsProbeRunner::RunProbe(const base::Closure& callback) {
   }
 
   transaction_ = factory->CreateTransaction(
-      kKnownGoodHostname,
-      net::dns_protocol::kTypeA,
+      kKnownGoodHostname, net::dns_protocol::kTypeA,
       base::Bind(&DnsProbeRunner::OnTransactionComplete,
                  weak_factory_.GetWeakPtr()),
-      BoundNetLog());
+      NetLogWithSource());
 
   transaction_->Start();
 }

chrome/browser/net/predictor.cc

@@ -932,7 +932,7 @@ bool Predictor::WouldLikelyProxyURL(const GURL& url) {
 
   net::ProxyInfo info;
   bool synchronous_success = proxy_service_->TryResolveProxySynchronously(
-      url, std::string(), &info, nullptr, net::BoundNetLog());
+      url, std::string(), &info, nullptr, net::NetLogWithSource());
 
   return synchronous_success && !info.is_direct();
 }

chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

@@ -294,9 +294,9 @@ void NetInternalsTest::MessageHandler::GetNetLogFileContents(
                                  nullptr);
   g_browser_process->net_log()->AddGlobalEntry(
       net::NetLogEventType::NETWORK_IP_ADDRESSES_CHANGED);
-  net::BoundNetLog bound_net_log = net::BoundNetLog::Make(
+  net::NetLogWithSource net_log_with_source = net::NetLogWithSource::Make(
       g_browser_process->net_log(), net::NetLogSourceType::URL_REQUEST);
-  bound_net_log.BeginEvent(net::NetLogEventType::REQUEST_ALIVE);
+  net_log_with_source.BeginEvent(net::NetLogEventType::REQUEST_ALIVE);
   net_log_logger->StopObserving(nullptr);
   net_log_logger.reset();