From d13c32787737f1822202802f062c41c38b90e5f5 Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Thu, 4 Feb 2010 00:24:51 +0000 Subject: Pass the NetworkChangeNotifier to HostResolver. This requires the following refactors: (1) NetworkChangeNotifier moves out of HttpNetworkSession into IOThread. (2) HostResolver gets initialized with NetworkChangeNotifier. (3) NetworkChangeNotifier needs to get passed into HttpCache and HttpNetworkSession (required updating a lot of files). (4) NetworkChangeNotifier is no longer reference counted. It is owned by IOThread. (5) IOThread gains a new struct: Globals. It can only be used on the io thread. (6) ChromeURLRequestContextFactory uses IOThread::Globals to initialize ChromeURLRequest objects with the host resolver and network change notifier. BUG=26159 Review URL: http://codereview.chromium.org/552117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38052 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_cache.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'net/http/http_cache.cc') diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index c99caca..b7989d1 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -124,7 +124,8 @@ class HttpCache::BackendCallback : public CallbackRunner > { //----------------------------------------------------------------------------- -HttpCache::HttpCache(HostResolver* host_resolver, +HttpCache::HttpCache(NetworkChangeNotifier* network_change_notifier, + HostResolver* host_resolver, ProxyService* proxy_service, SSLConfigService* ssl_config_service, const FilePath& cache_dir, @@ -133,7 +134,8 @@ HttpCache::HttpCache(HostResolver* host_resolver, mode_(NORMAL), type_(DISK_CACHE), network_layer_(HttpNetworkLayer::CreateFactory( - host_resolver, proxy_service, ssl_config_service)), + network_change_notifier, host_resolver, proxy_service, + ssl_config_service)), ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), enable_range_support_(true), cache_size_(cache_size) { @@ -151,14 +153,16 @@ HttpCache::HttpCache(HttpNetworkSession* session, cache_size_(cache_size) { } -HttpCache::HttpCache(HostResolver* host_resolver, +HttpCache::HttpCache(NetworkChangeNotifier* network_change_notifier, + HostResolver* host_resolver, ProxyService* proxy_service, SSLConfigService* ssl_config_service, int cache_size) : mode_(NORMAL), type_(MEMORY_CACHE), network_layer_(HttpNetworkLayer::CreateFactory( - host_resolver, proxy_service, ssl_config_service)), + network_change_notifier, host_resolver, proxy_service, + ssl_config_service)), ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), enable_range_support_(true), cache_size_(cache_size) { -- cgit v1.1