Rename NetLogLogger and CapturingNetLog

Renaming two classes
CapturingNetLog --> TestNetLog
NetLogLogger --> WriteToFileNetLogObserver

BUG=473252

TBR=jam,mmenke

Review URL: https://codereview.chromium.org/1084533002

Cr-Commit-Position: refs/heads/master@{#325611}

AUTHORS

@@ -570,6 +570,7 @@ Chanho Park <parkch98@gmail.com>
 Payal Pandey <payal.pandey@samsung.com>
 Kenneth Strickland <ken.strickland@gmail.com>
 Olli Syrjälä <olli.syrjala@intel.com>
+Vishal Bhatnagar <vishal.b@samsung.com>
 
 BlackBerry Limited <*@blackberry.com>
 Code Aurora Forum <*@codeaurora.org>

chrome/browser/extensions/api/dial/dial_service_unittest.cc

@@ -8,7 +8,7 @@
 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
 #include "chrome/browser/extensions/api/dial/dial_service.h"
 #include "net/base/ip_endpoint.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -43,13 +43,13 @@ class MockObserver : public DialService::Observer {
 class DialServiceTest : public testing::Test {
  public:
   DialServiceTest()
-    : dial_service_(&capturing_net_log_) {
+    : dial_service_(&test_net_log_) {
     CHECK(net::ParseIPLiteralToNumber("0.0.0.0", &mock_ip_));
     dial_service_.AddObserver(&mock_observer_);
     dial_socket_ = dial_service_.CreateDialSocket();
   }
  protected:
-  net::CapturingNetLog capturing_net_log_;
+  net::TestNetLog test_net_log_;
   net::IPAddressNumber mock_ip_;
   DialServiceImpl dial_service_;
   scoped_ptr<DialServiceImpl::DialSocket> dial_socket_;

chrome/browser/extensions/api/log_private/log_private_api.h

@@ -20,7 +20,7 @@
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "net/log/net_log.h"
-#include "net/log/net_log_logger.h"
+#include "net/log/write_to_file_net_log_observer.h"
 
 class IOThread;
 
@@ -113,7 +113,7 @@ class LogPrivateAPI : public BrowserContextKeyedAPI,
   api::log_private::EventSink event_sink_;
   std::set<std::string> net_internal_watches_;
   scoped_ptr<base::ListValue> pending_entries_;
-  scoped_ptr<net::NetLogLogger> net_log_logger_;
+  scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;
   // Listen to extension unloaded notifications.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;

chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc

@@ -287,10 +287,10 @@ void LogPrivateAPI::StartObservingNetEvents(
   if (!file->get())
     return;
 
-  net_log_logger_.reset(new net::NetLogLogger());
-  net_log_logger_->set_log_level(net::NetLog::LOG_ALL_BUT_BYTES);
-  net_log_logger_->StartObserving(io_thread->net_log(), file->Pass(), nullptr,
-                                  nullptr);
+  write_to_file_observer_.reset(new net::WriteToFileNetLogObserver());
+  write_to_file_observer_->set_log_level(net::NetLog::LOG_ALL_BUT_BYTES);
+  write_to_file_observer_->StartObserving(io_thread->net_log(), file->Pass(),
+                                  nullptr, nullptr);
 }
 
 void LogPrivateAPI::MaybeStartNetInternalLogging(
@@ -359,8 +359,8 @@ void LogPrivateAPI::StopNetInternalLogging() {
         net_log()->DeprecatedRemoveObserver(this);
         break;
       case api::log_private::EVENT_SINK_FILE:
-        net_log_logger_->StopObserving(nullptr);
-        net_log_logger_.reset();
+        write_to_file_observer_->StopObserving(nullptr);
+        write_to_file_observer_.reset();
         break;
       case api::log_private::EVENT_SINK_NONE:
         NOTREACHED();

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

@@ -45,7 +45,7 @@
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_file_element_reader.h"
 #include "net/dns/mock_host_resolver.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest-message.h"
@@ -1321,7 +1321,7 @@ TEST(ExtensionWebRequestHelpersTest, TestCalculateOnAuthRequiredDelta) {
 
 TEST(ExtensionWebRequestHelpersTest, TestMergeCancelOfResponses) {
   EventResponseDeltas deltas;
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   bool canceled = false;
 
@@ -1347,7 +1347,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeCancelOfResponses) {
 
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) {
   EventResponseDeltas deltas;
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   GURL effective_new_url;
@@ -1428,7 +1428,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) {
 // a kind of cancelling requests.
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) {
   EventResponseDeltas deltas;
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   GURL effective_new_url;
@@ -1497,7 +1497,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) {
 // a kind of cancelling requests.
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses3) {
   EventResponseDeltas deltas;
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   GURL effective_new_url;
@@ -1533,7 +1533,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeSendHeadersResponses) {
   net::HttpRequestHeaders base_headers;
   base_headers.AddHeaderFromString("key1: value 1");
   base_headers.AddHeaderFromString("key2: value 2");
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
@@ -1629,7 +1629,7 @@ TEST(ExtensionWebRequestHelpersTest,
   net::HttpRequestHeaders base_headers;
   base_headers.AddHeaderFromString(
       "Cookie: name=value; name2=value2; name3=\"value3\"");
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
@@ -1713,7 +1713,7 @@ std::string GetCookieExpirationDate(int delta_secs) {
 
 TEST(ExtensionWebRequestHelpersTest,
      TestMergeCookiesInOnHeadersReceivedResponses) {
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
@@ -1948,7 +1948,7 @@ TEST(ExtensionWebRequestHelpersTest,
 }
 
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
@@ -2048,7 +2048,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) {
 // Check that we do not delete too much
 TEST(ExtensionWebRequestHelpersTest,
      TestMergeOnHeadersReceivedResponsesDeletion) {
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   std::string header_value;
@@ -2102,7 +2102,7 @@ TEST(ExtensionWebRequestHelpersTest,
 TEST(ExtensionWebRequestHelpersTest,
      TestMergeOnHeadersReceivedResponsesRedirect) {
   EventResponseDeltas deltas;
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
 
@@ -2155,7 +2155,7 @@ TEST(ExtensionWebRequestHelpersTest,
 }
 
 TEST(ExtensionWebRequestHelpersTest, TestMergeOnAuthRequiredResponses) {
-  net::CapturingBoundNetLog capturing_net_log;
+  net::BoundTestNetLog capturing_net_log;
   net::BoundNetLog net_log = capturing_net_log.bound();
   WarningSet warning_set;
   EventResponseDeltas deltas;

chrome/browser/net/chrome_net_log.cc

@@ -16,8 +16,8 @@
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/content_switches.h"
-#include "net/log/net_log_logger.h"
 #include "net/log/trace_net_log_observer.h"
+#include "net/log/write_to_file_net_log_observer.h"
 
 ChromeNetLog::ChromeNetLog()
     : net_log_temp_file_(new NetLogTempFile(this)) {
@@ -45,7 +45,7 @@ ChromeNetLog::ChromeNetLog()
                  << " for net logging";
     } else {
       scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
-      net_log_logger_.reset(new net::NetLogLogger());
+      net_log_logger_.reset(new net::WriteToFileNetLogObserver());
       if (command_line->HasSwitch(switches::kNetLogLevel)) {
         std::string log_level_string =
             command_line->GetSwitchValueASCII(switches::kNetLogLevel);

chrome/browser/net/chrome_net_log.h

@@ -12,7 +12,7 @@
 #include "net/log/net_log.h"
 
 namespace net {
-class NetLogLogger;
+class WriteToFileNetLogObserver;
 class TraceNetLogObserver;
 }
 
@@ -30,7 +30,7 @@ class ChromeNetLog : public net::NetLog {
   }
 
  private:
-  scoped_ptr<net::NetLogLogger> net_log_logger_;
+  scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
   scoped_ptr<NetLogTempFile> net_log_temp_file_;
 
   scoped_ptr<net::TraceNetLogObserver> trace_net_log_observer_;

chrome/browser/net/net_log_temp_file.cc

@@ -10,7 +10,7 @@
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/log/net_log_logger.h"
+#include "net/log/write_to_file_net_log_observer.h"
 
 using content::BrowserThread;
 
@@ -144,7 +144,7 @@ void NetLogTempFile::StartNetLog(LogType log_type) {
   state_ = STATE_LOGGING;
 
   scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
-  net_log_logger_.reset(new net::NetLogLogger());
+  net_log_logger_.reset(new net::WriteToFileNetLogObserver());
   net_log_logger_->set_log_level(GetLogLevelForLogType(log_type));
   net_log_logger_->StartObserving(chrome_net_log_, file.Pass(), constants.get(),
                                   nullptr);

chrome/browser/net/net_log_temp_file.h

@@ -18,7 +18,7 @@ class DictionaryValue;
 }
 
 namespace net {
-class NetLogLogger;
+class WriteToFileNetLogObserver;
 }
 
 class ChromeNetLog;
@@ -152,7 +152,7 @@ class NetLogTempFile {
 
   // |net_log_logger_| watches the NetLog event stream, and sends all entries to
   // the file created in StartNetLog().
-  scoped_ptr<net::NetLogLogger> net_log_logger_;
+  scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
 
   // The |chrome_net_log_| is owned by the browser process, cached here to avoid
   // using global (g_browser_process).

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

@@ -68,8 +68,8 @@
 #include "net/http/http_server_properties.h"
 #include "net/http/http_stream_factory.h"
 #include "net/http/transport_security_state.h"
-#include "net/log/net_log_logger.h"
 #include "net/log/net_log_util.h"
+#include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"

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

@@ -37,7 +37,7 @@
 #include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/log/net_log.h"
-#include "net/log/net_log_logger.h"
+#include "net/log/write_to_file_net_log_observer.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -282,7 +282,8 @@ void NetInternalsTest::MessageHandler::GetNetLogLoggerLog(
   ASSERT_TRUE(temp_file_handle);
 
   scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
-  scoped_ptr<net::NetLogLogger> net_log_logger(new net::NetLogLogger());
+  scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger(
+      new net::WriteToFileNetLogObserver());
   net_log_logger->StartObserving(
       g_browser_process->net_log(), temp_file_handle.Pass(), constants.get(),
       nullptr);

components/cronet/android/cronet_url_request_context_adapter.cc

@@ -18,7 +18,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/network_delegate_impl.h"
 #include "net/http/http_auth_handler_factory.h"
-#include "net/log/net_log_logger.h"
+#include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
@@ -293,7 +293,7 @@ void CronetURLRequestContextAdapter::StartNetLogToFileOnNetworkThread(
   if (!file)
     return;
 
-  net_log_logger_.reset(new net::NetLogLogger());
+  net_log_logger_.reset(new net::WriteToFileNetLogObserver());
   net_log_logger_->StartObserving(context_->net_log(), file.Pass(), nullptr,
                                   context_.get());
 }

components/cronet/android/cronet_url_request_context_adapter.h

@@ -22,7 +22,7 @@ class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace net {
-class NetLogLogger;
+class WriteToFileNetLogObserver;
 class URLRequestContext;
 class ProxyConfigService;
 }  // namespace net
@@ -87,7 +87,7 @@ class CronetURLRequestContextAdapter {
   // Network thread is owned by |this|, but is destroyed from java thread.
   base::Thread* network_thread_;
   // |net_log_logger_| and |context_| should only be accessed on network thread.
-  scoped_ptr<net::NetLogLogger> net_log_logger_;
+  scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
   scoped_ptr<net::URLRequestContext> context_;
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
 

components/cronet/android/url_request_context_adapter.cc

@@ -21,7 +21,7 @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_server_properties.h"
-#include "net/log/net_log_logger.h"
+#include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
@@ -285,7 +285,7 @@ void URLRequestContextAdapter::StartNetLogToFileHelper(
   if (!file)
     return;
 
-  net_log_logger_.reset(new net::NetLogLogger());
+  net_log_logger_.reset(new net::WriteToFileNetLogObserver());
   net_log_logger_->StartObserving(context_->net_log(), file.Pass(), nullptr,
                                   context_.get());
 }

components/cronet/android/url_request_context_adapter.h

@@ -21,7 +21,7 @@
 
 namespace net {
 
-class NetLogLogger;
+class WriteToFileNetLogObserver;
 
 class ProxyConfigService;
 
@@ -107,7 +107,7 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
   bool load_disable_cache_;
   base::Thread* network_thread_;
   scoped_ptr<NetLogObserver> net_log_observer_;
-  scoped_ptr<net::NetLogLogger> net_log_logger_;
+  scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   scoped_ptr<URLRequestContextConfig> config_;
 

components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

@@ -13,7 +13,7 @@
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
 #include "net/proxy/proxy_server.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"

components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/test/test_simple_task_runner.h"
 #include "base/values.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,7 +20,7 @@ class DataReductionProxyConfiguratorTest : public testing::Test {
  public:
   void SetUp() override {
     task_runner_ = new base::TestSimpleTaskRunner();
-    net_log_.reset(new net::CapturingNetLog());
+    net_log_.reset(new net::TestNetLog());
     data_reduction_proxy_event_store_.reset(
         new data_reduction_proxy::DataReductionProxyEventStore(task_runner_));
     config_.reset(new DataReductionProxyConfigurator(