Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/profile_sync_service.cc

-// 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.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
@@ skipping 32 matching lines @@
 using browser_sync::SyncBackendHost;
 
 typedef GoogleServiceAuthError AuthError;
 
 const char* ProfileSyncService::kSyncServerUrl =
     "https://clients4.google.com/chrome-sync";
 
 const char* ProfileSyncService::kDevServerUrl =
     "https://clients4.google.com/chrome-sync/dev";
 
-ProfileSyncService::ProfileSyncService(
-    ProfileSyncFactory* factory,
-    Profile* profile,
-    chrome_common_net::NetworkChangeNotifierThread*
-        network_change_notifier_thread,
-    bool bootstrap_sync_authentication)
+ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory,
+                                       Profile* profile,
+                                       bool bootstrap_sync_authentication)
     : last_auth_error_(AuthError::None()),
       factory_(factory),
       profile_(profile),
-      network_change_notifier_thread_(network_change_notifier_thread),
       bootstrap_sync_authentication_(bootstrap_sync_authentication),
       sync_service_url_(kDevServerUrl),
       backend_initialized_(false),
       expecting_first_run_auth_needed_event_(false),
       is_auth_in_progress_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(wizard_(this)),
       unrecoverable_error_detected_(false),
       notification_method_(browser_sync::kDefaultNotificationMethod),
       ALLOW_THIS_IN_INITIALIZER_LIST(scoped_runnable_method_factory_(this)) {
   DCHECK(factory);
   DCHECK(profile);
-  DCHECK(network_change_notifier_thread_);
   registrar_.Add(this,
                  NotificationType::SYNC_CONFIGURE_START,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::SYNC_CONFIGURE_DONE,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::SYNC_PASSPHRASE_REQUIRED,
                  NotificationService::AllSources());
   registrar_.Add(this,
@@ skipping 17 matching lines @@
   }
 #else
   LOG(INFO) << "Unofficial build, using dev channel sync server.";
 #endif
 }
 
 ProfileSyncService::ProfileSyncService()
     : last_auth_error_(AuthError::None()),
       factory_(NULL),
       profile_(NULL),
-      network_change_notifier_thread_(NULL),
       bootstrap_sync_authentication_(false),
       sync_service_url_(kSyncServerUrl),
       backend_initialized_(false),
       expecting_first_run_auth_needed_event_(false),
       is_auth_in_progress_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(wizard_(this)),
       unrecoverable_error_detected_(false),
       notification_method_(browser_sync::kDefaultNotificationMethod),
       ALLOW_THIS_IN_INITIALIZER_LIST(scoped_runnable_method_factory_(this)) {
 }
@@ skipping 143 matching lines @@
   invalidate_sync_login = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kInvalidateSyncLogin);
   invalidate_sync_xmpp_login = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kInvalidateSyncXmppLogin);
 #endif
 
   syncable::ModelTypeSet types;
   GetPreferredDataTypes(&types);
   backend_->Initialize(sync_service_url_,
                        types,
-                       network_change_notifier_thread_,
                        profile_->GetRequestContext(),
                        GetLsidForAuthBootstraping(),
                        delete_sync_data_folder,
                        invalidate_sync_login,
                        invalidate_sync_xmpp_login,
                        notification_method_);
 }
 
 void ProfileSyncService::StartUp() {
   // Don't start up multiple times.
@@ skipping 499 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }