Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/io_thread.h

 // 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.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/common/net/dns.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "net/base/host_resolver.h"
 
 class ChromeNetLog;
 class ListValue;
 
 namespace chrome_browser_net {
 class DnsMaster;
 }  // namespace chrome_browser_net
 
 namespace net {
 class HttpAuthHandlerFactory;
-class NetworkChangeNotifier;
 class URLSecurityManager;
 }  // namespace net
 
 class IOThread : public BrowserProcessSubThread {
  public:
   struct Globals {
     scoped_ptr<ChromeNetLog> net_log;
-    scoped_ptr<net::NetworkChangeNotifier> network_change_notifier;
     // TODO(willchan): Stop reference counting HostResolver.  It's owned by
     // IOThread now.
     scoped_refptr<net::HostResolver> host_resolver;
     scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
     scoped_ptr<net::URLSecurityManager> url_security_manager;
     ChromeNetworkDelegate network_delegate;
   };
 
   IOThread();
 
@@ skipping 61 matching lines @@
   // these observers would be used accidentally after we have begun to tear
   // down.
   chrome_browser_net::ConnectInterceptor* speculative_interceptor_;
   net::HostResolver::Observer* prefetch_observer_;
   chrome_browser_net::DnsMaster* dns_master_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_