Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: chrome/browser/io_thread.h

Issue 2968293002: Introduce SystemNetworkContextManager. (Closed)
Patch Set: Response to comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index e250176d69208587c91f91ff4c5732e4c027e43b..593491bf83a014aa4a967dc58369466a0e7c8ae7 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -23,12 +23,15 @@
#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"
@@ -127,6 +130,11 @@ class IOThread : public content::BrowserThreadDelegate {
Globals();
~Globals();
+ // In-process NetworkService for use in URLRequestContext configuration when
+ // the network service created through the ServiceManager is disabled. See
+ // SystemNetworkContextManager's 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;
@@ -140,7 +148,8 @@ class IOThread : public content::BrowserThreadDelegate {
#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>
@@ -323,6 +332,11 @@ class IOThread : public content::BrowserThreadDelegate {
bool allow_gssapi_library_load_;
#endif
+ // These are set on the UI thread, and then consumed during initialization on
+ // the IO thread.
+ 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>
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698