Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/service/service_process.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_SERVICE_SERVICE_PROCESS_H_
 #define CHROME_SERVICE_SERVICE_PROCESS_H_
 
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/thread.h"
 
 class CloudPrintProxy;
 class JsonPrefStore;
-class ServiceNetworkChangeNotifierThread;
+namespace net {
+class NetworkChangeNotifier;
+}
 
 // The ServiceProcess does not inherit from ChildProcess because this
 // process can live independently of the browser process.
 class ServiceProcess {
  public:
   ServiceProcess();
   ~ServiceProcess();
 
   bool Initialize();
   bool Teardown();
@@ skipping 13 matching lines @@
   base::Thread* io_thread() const {
     return io_thread_.get();
   }
   // Returns the thread that we perform random file operations on. For code
   // that wants to do I/O operations (not network requests or even file: URL
   // requests), this is the thread to use to avoid blocking the UI thread.
   base::Thread* file_thread() const {
     return file_thread_.get();
   }
   CloudPrintProxy* CreateCloudPrintProxy(JsonPrefStore* service_prefs);
-  ServiceNetworkChangeNotifierThread* network_change_notifier_thread() const {
-    return network_change_notifier_thread_.get();
-  }
 
  private:
+  scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<base::Thread> io_thread_;
   scoped_ptr<base::Thread> file_thread_;
   std::vector<CloudPrintProxy*> cloud_print_proxy_list_;
-  scoped_refptr<ServiceNetworkChangeNotifierThread>
-      network_change_notifier_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceProcess);
 };
 
 extern ServiceProcess* g_service_process;
 
 #endif  // CHROME_SERVICE_SERVICE_PROCESS_H_