Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/glue/sync_backend_host.h

-// 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "googleurl/src/gurl.h"
 
 class CancelableTask;
 class Profile;
 
-namespace chrome_common_net {
-class NetworkChangeNotifierThread;
-}
-
 namespace browser_sync {
 
 namespace sessions {
 struct SyncSessionSnapshot;
 }
 
 class ChangeProcessor;
 class DataTypeController;
 
 // SyncFrontend is the interface used by SyncBackendHost to communicate with
@@ skipping 47 matching lines @@
   // TODO(skrul): Extract an interface so this is not needed.
   SyncBackendHost();
   ~SyncBackendHost();
 
   // Called on |frontend_loop_| to kick off asynchronous initialization.
   // As a fallback when no cached auth information is available, try to
   // bootstrap authentication using |lsid|, if it isn't empty.
   // 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,
                   bool invalidate_sync_login,
                   bool invalidate_sync_xmpp_login,
                   NotificationMethod notification_method);
 
   // Called on |frontend_loop_| to kick off asynchronous authentication.
   void Authenticate(const std::string& username, const std::string& password,
                     const std::string& captcha);
@@ skipping 58 matching lines @@
   string16 GetAuthenticatedUsername() const;
 
   // ModelSafeWorkerRegistrar implementation.
   virtual void GetWorkers(std::vector<browser_sync::ModelSafeWorker*>* out);
   virtual void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out);
 
 #if defined(UNIT_TEST)
   // 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,
                              NotificationMethod notification_method) {
     if (!core_thread_.Start())
       return;
     registrar_.workers[GROUP_UI] = new UIModelWorker(frontend_loop_);
     registrar_.routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
     registrar_.routing_info[syncable::PREFERENCES] = GROUP_PASSIVE;
     registrar_.routing_info[syncable::AUTOFILL] = GROUP_PASSIVE;
     registrar_.routing_info[syncable::THEMES] = GROUP_PASSIVE;
     registrar_.routing_info[syncable::TYPED_URLS] = GROUP_PASSIVE;
     registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE;
     registrar_.routing_info[syncable::PASSWORDS] = GROUP_PASSIVE;
 
     core_thread_.message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(core_.get(),
         &SyncBackendHost::Core::DoInitializeForTest,
         test_user,
-        network_change_notifier_thread,
         factory,
         auth_factory,
         delete_sync_data_folder,
         notification_method));
   }
 #endif
 
  private:
   // The real guts of SyncBackendHost, to keep the public client API clean.
   class Core : public base::RefCountedThreadSafe<SyncBackendHost::Core>,
@@ skipping 15 matching lines @@
     virtual void OnAuthError(const GoogleServiceAuthError& auth_error);
     virtual void OnPassphraseRequired();
     virtual void OnPassphraseAccepted();
     virtual void OnPaused();
     virtual void OnResumed();
 
     struct DoInitializeOptions {
       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,
           bool delete_sync_data_folder,
           bool invalidate_sync_login,
           bool invalidate_sync_xmpp_login,
           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),
             delete_sync_data_folder(delete_sync_data_folder),
             invalidate_sync_login(invalidate_sync_login),
             invalidate_sync_xmpp_login(invalidate_sync_xmpp_login),
             notification_method(notification_method) {}
 
       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;
       bool delete_sync_data_folder;
       bool invalidate_sync_login;
       bool invalidate_sync_xmpp_login;
       NotificationMethod notification_method;
     };
 
     // Note:
@@ skipping 40 matching lines @@
     // Delete the sync data folder to cleanup backend data.  Happens the first
     // time sync is enabled for a user (to prevent accidentally reusing old
     // sync databases), as well as shutdown when you're no longer syncing.
     void DeleteSyncDataFolder();
 
 #if defined(UNIT_TEST)
     // Special form of initialization that does not try and authenticate the
     // 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
 
    private:
     friend class base::RefCountedThreadSafe<SyncBackendHost::Core>;
 
     ~Core() {}
 
     // Sends a SYNC_PAUSED notification to the notification service on
@@ skipping 120 matching lines @@
 
   // UI-thread cache of the last SyncSessionSnapshot received from syncapi.
   scoped_ptr<sessions::SyncSessionSnapshot> last_snapshot_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_