Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/test_profile_sync_service.h

Index: chrome/browser/sync/test_profile_sync_service.h
===================================================================
--- chrome/browser/sync/test_profile_sync_service.h	(revision 50775)
+++ chrome/browser/sync/test_profile_sync_service.h	(working copy)
@@ -11,7 +11,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/common/net/fake_network_change_notifier_thread.h"
 #include "chrome/test/sync/test_http_bridge_factory.h"
 
 class TestProfileSyncService : public ProfileSyncService {
@@ -20,33 +19,21 @@
                                   Profile* profile,
                                   bool bootstrap_sync_authentication,
                                   bool synchronous_backend_initialization)
-      : ProfileSyncService(factory, profile,
-                           &fake_network_change_notifier_thread_,
-                           bootstrap_sync_authentication),
+      : ProfileSyncService(factory, profile, bootstrap_sync_authentication),
         synchronous_backend_initialization_(
             synchronous_backend_initialization) {
-    fake_network_change_notifier_thread_.Start();
     RegisterPreferences();
     SetSyncSetupCompleted();
   }
-  virtual ~TestProfileSyncService() {
-    // This needs to happen before
-    // |fake_network_change_notifier_thread_| is stopped.  This is
-    // also called again in ProfileSyncService's destructor, but
-    // calling it multiple times is okay.
-    Shutdown(false);
-    fake_network_change_notifier_thread_.Stop();
-  }
+  virtual ~TestProfileSyncService() { }
 
   virtual void InitializeBackend(bool delete_sync_data_folder) {
     browser_sync::TestHttpBridgeFactory* factory =
         new browser_sync::TestHttpBridgeFactory();
     browser_sync::TestHttpBridgeFactory* factory2 =
         new browser_sync::TestHttpBridgeFactory();
-    backend()->InitializeForTestMode(
-        L"testuser", &fake_network_change_notifier_thread_,
-        factory, factory2, delete_sync_data_folder,
-        browser_sync::kDefaultNotificationMethod);
+    backend()->InitializeForTestMode(L"testuser", factory, factory2,
+        delete_sync_data_folder, browser_sync::kDefaultNotificationMethod);
     // TODO(akalin): Figure out a better way to do this.
     if (synchronous_backend_initialization_) {
       // The SyncBackend posts a task to the current loop when
@@ -74,8 +61,6 @@
   }
 
   bool synchronous_backend_initialization_;
-  chrome_common_net::FakeNetworkChangeNotifierThread
-      fake_network_change_notifier_thread_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_