Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/glue/sync_backend_host.h

Index: chrome/browser/sync/glue/sync_backend_host.h
===================================================================
--- chrome/browser/sync/glue/sync_backend_host.h	(revision 50775)
+++ chrome/browser/sync/glue/sync_backend_host.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -29,10 +29,6 @@
 class CancelableTask;
 class Profile;
 
-namespace chrome_common_net {
-class NetworkChangeNotifierThread;
-}
-
 namespace browser_sync {
 
 namespace sessions {
@@ -100,8 +96,6 @@
   // Optionally delete the Sync Data folder (if it's corrupt).
   void Initialize(const GURL& service_url,
                   const syncable::ModelTypeSet& types,
-                  chrome_common_net::NetworkChangeNotifierThread*
-                      network_change_notifier_thread,
                   URLRequestContextGetter* baseline_context_getter,
                   const std::string& lsid,
                   bool delete_sync_data_folder,
@@ -180,8 +174,6 @@
   // Called from unit test to bypass authentication and initialize the syncapi
   // to a state suitable for testing but not production.
   void InitializeForTestMode(const std::wstring& test_user,
-                             chrome_common_net::NetworkChangeNotifierThread*
-                                 network_change_notifier_thread,
                              sync_api::HttpPostProviderFactory* factory,
                              sync_api::HttpPostProviderFactory* auth_factory,
                              bool delete_sync_data_folder,
@@ -201,7 +193,6 @@
         NewRunnableMethod(core_.get(),
         &SyncBackendHost::Core::DoInitializeForTest,
         test_user,
-        network_change_notifier_thread,
         factory,
         auth_factory,
         delete_sync_data_folder,
@@ -237,8 +228,6 @@
       DoInitializeOptions(
           const GURL& service_url,
           bool attempt_last_user_authentication,
-          chrome_common_net::NetworkChangeNotifierThread*
-              network_change_notifier_thread,
           sync_api::HttpPostProviderFactory* http_bridge_factory,
           sync_api::HttpPostProviderFactory* auth_http_bridge_factory,
           const std::string& lsid,
@@ -248,7 +237,6 @@
           NotificationMethod notification_method)
           : service_url(service_url),
             attempt_last_user_authentication(attempt_last_user_authentication),
-            network_change_notifier_thread(network_change_notifier_thread),
             http_bridge_factory(http_bridge_factory),
             auth_http_bridge_factory(auth_http_bridge_factory),
             lsid(lsid),
@@ -259,8 +247,6 @@
 
       GURL service_url;
       bool attempt_last_user_authentication;
-      chrome_common_net::NetworkChangeNotifierThread*
-          network_change_notifier_thread;
       sync_api::HttpPostProviderFactory* http_bridge_factory;
       sync_api::HttpPostProviderFactory* auth_http_bridge_factory;
       std::string lsid;
@@ -321,19 +307,13 @@
     // last known user (since it will fail in test mode) and does some extra
     // setup to nudge the syncapi into a useable state.
     void DoInitializeForTest(const std::wstring& test_user,
-                             chrome_common_net::NetworkChangeNotifierThread*
-                                 network_change_notifier_thread,
                              sync_api::HttpPostProviderFactory* factory,
                              sync_api::HttpPostProviderFactory* auth_factory,
                              bool delete_sync_data_folder,
                              NotificationMethod notification_method) {
-      DoInitialize(
-          DoInitializeOptions(GURL(), false,
-                              network_change_notifier_thread,
-                              factory, auth_factory,
-                              std::string(), delete_sync_data_folder,
-                              false, false,
-                              notification_method));
+      DoInitialize(DoInitializeOptions(GURL(), false, factory, auth_factory,
+                                       std::string(), delete_sync_data_folder,
+                                       false, false, notification_method));
         syncapi_->SetupForTestMode(test_user);
     }
 #endif