Introduce SystemNetworkContextManager.

chrome/browser/io_thread.h

 // 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.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
+#include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/common/features.h"
 #include "components/metrics/data_use_tracker.h"
 #include "components/prefs/pref_member.h"
 #include "components/ssl_config/ssl_config_service_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
+#include "content/public/common/network_service.mojom.h"
+#include "content/public/network/network_service.h"
 #include "extensions/features/features.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_network_session.h"
 #include "net/nqe/network_quality_estimator.h"
 
 class PrefProxyConfigTracker;
 class PrefService;
 class PrefRegistrySimple;
 
 #if defined(OS_ANDROID)
@@ skipping 78 matching lines @@
       explicit SystemRequestContextLeakChecker(Globals* globals);
       ~SystemRequestContextLeakChecker();
 
      private:
       Globals* const globals_;
     };
 
     Globals();
     ~Globals();
 
+    // In-process NetworkService for use in URLRequestContext configuration when
+    // the actual network service is disabled. See SystemNetworkContextManager's

[asanka, 2017/07/13 01:52:29]

s/actual/out-of-process/ ?

[mmenke, 2017/07/13 16:15:18]

Except it's not necessarily out of process, as John pointed out.  It's just the
one created by the ServiceManager (Which will be in process on Android,
presumably).  Reworded slightly.

+    // header comment for more details
+    std::unique_ptr<content::NetworkService> network_service;
+
     // Ascribes all data use in Chrome to a source, such as page loads.
     std::unique_ptr<data_use_measurement::ChromeDataUseAscriber>
         data_use_ascriber;
     // Global aggregator of data use. It must outlive the
     // |system_network_delegate|.
     std::unique_ptr<data_usage::DataUseAggregator> data_use_aggregator;
 #if defined(OS_ANDROID)
     // An external observer of data use.
     std::unique_ptr<chrome::android::ExternalDataUseObserver>
         external_data_use_observer;
 #endif  // defined(OS_ANDROID)
     std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs;
     std::unique_ptr<net::HttpAuthPreferences> http_auth_preferences;
-    std::unique_ptr<net::URLRequestContext> system_request_context;
+    std::unique_ptr<content::mojom::NetworkContext> system_network_context;
+    net::URLRequestContext* system_request_context;
     SystemRequestContextLeakChecker system_request_context_leak_checker;
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     scoped_refptr<extensions::EventRouterForwarder>
         extension_event_router_forwarder;
 #endif
     std::unique_ptr<net::HostMappingRules> host_mapping_rules;
     std::unique_ptr<net::NetworkQualityEstimator> network_quality_estimator;
     std::unique_ptr<net::RTTAndThroughputEstimatesObserver>
         network_quality_observer;
 
@@ skipping 162 matching lines @@
   // No PrefMember for the GSSAPI library name, since changing it after startup
   // requires unloading the existing GSSAPI library, which could cause all sorts
   // of problems for, for example, active Negotiate transactions.
   std::string gssapi_library_name_;
 #endif
 
 #if defined(OS_CHROMEOS)
   bool allow_gssapi_library_load_;
 #endif
 
+  // These are set on the IOThread, and then consumed during initialization on

[asanka, 2017/07/13 01:52:29]

... are set on the UI thread, and then ... on the IO thread.
                   ~~~~~~~~~                      ~~~~~~~~~

[mmenke, 2017/07/13 16:15:18]

Done.

+  // the IOThread.
+  content::mojom::NetworkContextRequest network_context_request_;
+  content::mojom::NetworkContextParamsPtr network_context_params_;
+
   // This is an instance of the default SSLConfigServiceManager for the current
   // platform and it gets SSL preferences from local_state object.
   std::unique_ptr<ssl_config::SSLConfigServiceManager>
       ssl_config_service_manager_;
 
   // These member variables are initialized by a task posted to the IO thread,
   // which gets posted by calling certain member functions of IOThread.
   std::unique_ptr<net::ProxyConfigService> system_proxy_config_service_;
 
   std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   scoped_refptr<net::URLRequestContextGetter>
       system_url_request_context_getter_;
 
   // True if QUIC is allowed by policy.
   bool is_quic_allowed_by_policy_;
 
   // True if HTTP/0.9 is allowed on non-default ports by policy.
   bool http_09_on_non_default_ports_enabled_;
 
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_