Add ongoing events to net-export log when logging starts

chrome/browser/io_thread.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/io_thread.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 272 matching lines @@
                  message_size,
                  is_cellular));
 }
 
 }  // namespace
 
 class SystemURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
   explicit SystemURLRequestContextGetter(IOThread* io_thread);
 
-  // Implementation for net::UrlRequestContextGetter.
+  // net::URLRequestContextGetter implementation.

[eroman, 2017/02/21 22:14:23]

Was this a manual change or something the linter did?

[wangyix1, 2017/02/22 01:28:18]

I manually changed this. I don't really know why.

   net::URLRequestContext* GetURLRequestContext() override;
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
       const override;
 
  protected:
   ~SystemURLRequestContextGetter() override;
 
  private:
   IOThread* const io_thread_;  // Weak pointer, owned by BrowserProcess.
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
@@ skipping 14 matching lines @@
   DCHECK(io_thread_->globals()->system_request_context.get());
 
   return io_thread_->globals()->system_request_context.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 SystemURLRequestContextGetter::GetNetworkTaskRunner() const {
   return network_task_runner_;
 }
 
+class ProxyScriptFetcherContextGetter : public net::URLRequestContextGetter {
+ public:
+  explicit ProxyScriptFetcherContextGetter(IOThread* io_thread);
+
+  // net::URLRequestContextGetter implementation.
+  net::URLRequestContext* GetURLRequestContext() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override;
+
+ protected:
+  ~ProxyScriptFetcherContextGetter() override;
+
+ private:
+  IOThread* const io_thread_;  // Weak pointer, owned by BrowserProcess.

[eroman, 2017/02/21 22:14:23]

Can remove "weak pointer" (which has specific meaning in our code, and does not
apply here).
Saying it is owned by BrowserProcess is sufficient.

[wangyix1, 2017/02/22 01:28:18]

Done.

+  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;

[eroman, 2017/02/21 22:14:23]

Instead of this member variable how about just returning
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO) from
GetNetworkTaskRunner() ?

[wangyix1, 2017/02/22 01:28:18]

Done.

+
+  base::debug::LeakTracker<ProxyScriptFetcherContextGetter> leak_tracker_;
+};
+
+ProxyScriptFetcherContextGetter::ProxyScriptFetcherContextGetter(
+    IOThread* io_thread)
+    : io_thread_(io_thread),
+      network_task_runner_(
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)) {}
+
+ProxyScriptFetcherContextGetter::~ProxyScriptFetcherContextGetter() {}
+
+net::URLRequestContext*
+ProxyScriptFetcherContextGetter::GetURLRequestContext() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(io_thread_->globals()->proxy_script_fetcher_context.get());
+
+  return io_thread_->globals()->proxy_script_fetcher_context.get();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+ProxyScriptFetcherContextGetter::GetNetworkTaskRunner() const {
+  return network_task_runner_;
+}
+
 IOThread::Globals::
 SystemRequestContextLeakChecker::SystemRequestContextLeakChecker(
     Globals* globals)
     : globals_(globals) {
   DCHECK(globals_);
 }
 
 IOThread::Globals::
 SystemRequestContextLeakChecker::~SystemRequestContextLeakChecker() {
   if (globals_->system_request_context.get())
@@ skipping 144 matching lines @@
 }
 
 net::URLRequestContextGetter* IOThread::system_url_request_context_getter() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!system_url_request_context_getter_.get()) {
     InitSystemRequestContext();
   }
   return system_url_request_context_getter_.get();
 }
 
+net::URLRequestContextGetter* IOThread::proxy_script_fetcher_context_getter() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  return proxy_script_fetcher_context_getter_.get();
+}
+
 void IOThread::Init() {
   TRACE_EVENT0("startup", "IOThread::InitAsync");
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
 #if defined(USE_NSS_CERTS)
   net::SetMessageLoopForNSSHttpIO();
 #endif
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
@@ skipping 147 matching lines @@
   ConfigureParamsFromFieldTrialsAndCommandLine(
       command_line, is_quic_allowed_by_policy_,
       http_09_on_non_default_ports_enabled_, &params_);
 
   TRACE_EVENT_BEGIN0("startup",
                      "IOThread::Init:ProxyScriptFetcherRequestContext");
   globals_->proxy_script_fetcher_context.reset(
       ConstructProxyScriptFetcherContext(globals_, params_, net_log_));
   TRACE_EVENT_END0("startup",
                    "IOThread::Init:ProxyScriptFetcherRequestContext");
+  proxy_script_fetcher_context_getter_ =
+      new ProxyScriptFetcherContextGetter(this);
 
 #if defined(OS_MACOSX)
   // Start observing Keychain events. This needs to be done on the UI thread,
   // as Keychain services requires a CFRunLoop.
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&ObserveKeychainEvents));
 #endif
 
   // InitSystemRequestContext turns right around and posts a task back
@@ skipping 47 matching lines @@
   net::NetworkChangeNotifier::ShutdownHistogramWatcher();
 
   // This must be reset before the ChromeNetLog is destroyed.
   network_change_observer_.reset();
 
   system_proxy_config_service_.reset();
   delete globals_;
   globals_ = NULL;
 
   base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks();
+  base::debug::LeakTracker<ProxyScriptFetcherContextGetter>::CheckForLeaks();
 }
 
 // static
 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kAuthSchemes,
                                "basic,digest,ntlm,negotiate");
   registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false);
   registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false);
   registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
@@ skipping 376 matching lines @@
 
   // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
   // system URLRequestContext too. There's no reason this should be tied to a
   // profile.
   return context;
 }
 
 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() {
   return base::Bind(&UpdateMetricsUsagePrefsOnUIThread);
 }