Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/io_thread.cc

 // Copyright (c) 2010 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 "base/command_line.h"
 #include "base/leak_tracker.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/passive_log_collector.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "net/base/mapped_host_resolver.h"
 #include "net/base/host_cache.h"
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_impl.h"
 #include "net/base/net_util.h"
-#include "net/base/network_change_notifier.h"
 #include "net/http/http_auth_filter.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_auth_handler_negotiate.h"
 
 namespace {
 
-net::HostResolver* CreateGlobalHostResolver(
-    net::NetworkChangeNotifier* network_change_notifier) {
+net::HostResolver* CreateGlobalHostResolver() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  net::HostResolver* global_host_resolver =
-      net::CreateSystemHostResolver(network_change_notifier);
+  net::HostResolver* global_host_resolver = net::CreateSystemHostResolver();
 
   // Determine if we should disable IPv6 support.
   if (!command_line.HasSwitch(switches::kEnableIPv6)) {
     if (command_line.HasSwitch(switches::kDisableIPv6)) {
       global_host_resolver->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4);
     } else {
       net::HostResolverImpl* host_resolver_impl =
           global_host_resolver->GetAsHostResolverImpl();
       if (host_resolver_impl != NULL) {
         // (optionally) Use probe to decide if support is warranted.
@@ skipping 84 matching lines @@
           &IOThread::ChangedToOnTheRecordOnIOThread));
 }
 
 void IOThread::Init() {
   BrowserProcessSubThread::Init();
 
   DCHECK(!globals_);
   globals_ = new Globals;
 
   globals_->net_log.reset(new ChromeNetLog());
-  globals_->network_change_notifier.reset(
-      net::NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier());
-  globals_->host_resolver =
-      CreateGlobalHostResolver(globals_->network_change_notifier.get());
+  globals_->host_resolver = CreateGlobalHostResolver();
   globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory());
 }
 
 void IOThread::CleanUp() {
   // If any child processes are still running, terminate them and
   // and delete the ChildProcessHost instances to release whatever
   // IO thread only resources they are referencing.
   ChildProcessHost::TerminateAll();
 
   // Not initialized in Init().  May not be initialized.
@@ skipping 137 matching lines @@
     net::HostCache* host_cache =
         globals_->host_resolver.get()->GetAsHostResolverImpl()->cache();
     if (host_cache)
       host_cache->clear();
   }
   // Clear all of the passively logged data.
   // TODO(eroman): this is a bit heavy handed, really all we need to do is
   //               clear the data pertaining to off the record context.
   globals_->net_log->passive_collector()->Clear();
 }