Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/profile_sync_factory_impl.cc

 // 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 "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/glue/autofill_change_processor.h"
 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
@@ skipping 43 matching lines @@
 using browser_sync::PreferenceModelAssociator;
 using browser_sync::SyncBackendHost;
 using browser_sync::ThemeChangeProcessor;
 using browser_sync::ThemeDataTypeController;
 using browser_sync::ThemeModelAssociator;
 using browser_sync::TypedUrlChangeProcessor;
 using browser_sync::TypedUrlDataTypeController;
 using browser_sync::TypedUrlModelAssociator;
 using browser_sync::UnrecoverableErrorHandler;
 
-ProfileSyncFactoryImpl::ProfileSyncFactoryImpl(
-    Profile* profile,
-    chrome_common_net::NetworkChangeNotifierThread*
-        network_change_notifier_thread,
-    CommandLine* command_line)
+ProfileSyncFactoryImpl::ProfileSyncFactoryImpl(Profile* profile,
+                                               CommandLine* command_line)
     : profile_(profile),
-      network_change_notifier_thread_(network_change_notifier_thread),
       command_line_(command_line) {
-  DCHECK(network_change_notifier_thread_);
 }
 
 ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService() {
-  ProfileSyncService* pss =
-      new ProfileSyncService(this,
-                             profile_,
-                             network_change_notifier_thread_,
-                             browser_defaults::kBootstrapSyncAuthentication);
+  ProfileSyncService* pss = new ProfileSyncService(
+      this, profile_, browser_defaults::kBootstrapSyncAuthentication);
 
   // Autofill sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncAutofill)) {
     pss->RegisterDataTypeController(
         new AutofillDataTypeController(this, profile_, pss));
   }
 
   // Bookmark sync is enabled by default.  Register unless explicitly
   // disabled.
@@ skipping 132 matching lines @@
     browser_sync::UnrecoverableErrorHandler* error_handler) {
   TypedUrlModelAssociator* model_associator =
       new TypedUrlModelAssociator(profile_sync_service,
                                   history_backend);
   TypedUrlChangeProcessor* change_processor =
       new TypedUrlChangeProcessor(model_associator,
                                   history_backend,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }