Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/glue/sync_backend_host.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 "build/build_config.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_version_info.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 48 matching lines @@
 }
 
 SyncBackendHost::~SyncBackendHost() {
   DCHECK(!core_ && !frontend_) << "Must call Shutdown before destructor.";
   DCHECK(registrar_.workers.empty());
 }
 
 void SyncBackendHost::Initialize(
     const GURL& sync_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) {
   if (!core_thread_.Start())
     return;
 
   // Create a worker for the UI thread and route bookmark changes to it.
@@ skipping 18 matching lines @@
   for (syncable::ModelTypeSet::const_iterator it = types.begin();
       it != types.end(); ++it) {
     registrar_.routing_info[(*it)] = GROUP_PASSIVE;
   }
   registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE;
 
   core_thread_.message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(core_.get(), &SyncBackendHost::Core::DoInitialize,
                         Core::DoInitializeOptions(
                             sync_service_url, true,
-                            network_change_notifier_thread,
                             new HttpBridgeFactory(baseline_context_getter),
                             new HttpBridgeFactory(baseline_context_getter),
                             lsid,
                             delete_sync_data_folder,
                             invalidate_sync_login,
                             invalidate_sync_xmpp_login,
                             notification_method)));
 }
 
 void SyncBackendHost::Authenticate(const std::string& username,
@@ skipping 264 matching lines @@
   DCHECK(success);
 
   syncapi_->SetObserver(this);
   const FilePath& path_str = host_->sync_data_folder_path();
   success = syncapi_->Init(path_str,
       (options.service_url.host() + options.service_url.path()).c_str(),
       options.service_url.EffectiveIntPort(),
       kGaiaServiceId,
       kGaiaSourceForChrome,
       options.service_url.SchemeIsSecure(),
-      options.network_change_notifier_thread,
       options.http_bridge_factory,
       options.auth_http_bridge_factory,
       host_,  // ModelSafeWorkerRegistrar.
       options.attempt_last_user_authentication,
       options.invalidate_sync_login,
       options.invalidate_sync_xmpp_login,
       MakeUserAgentForSyncapi().c_str(),
       options.lsid.c_str(),
       options.notification_method);
   DCHECK(success) << "Syncapi initialization failed!";
@@ skipping 203 matching lines @@
 }
 
 void SyncBackendHost::Core::DeleteSyncDataFolder() {
   if (file_util::DirectoryExists(host_->sync_data_folder_path())) {
     if (!file_util::Delete(host_->sync_data_folder_path(), true))
       LOG(DFATAL) << "Could not delete the Sync Data folder.";
   }
 }
 
 }  // namespace browser_sync