Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/profile.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 "chrome/browser/profile.h"
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/env_var.h"
@@ skipping 38 matching lines @@
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/browser/privacy_blacklist/blacklist.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
-#include "chrome/browser/sync/net/network_change_notifier_io_thread.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_factory_impl.h"
 #include "chrome/browser/tabs/pinned_tab_service.h"
 #include "chrome/browser/thumbnail_store.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/visitedlink_master.h"
 #include "chrome/browser/visitedlink_event_listener.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/web_resource/web_resource_service.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 1603 matching lines @@
   return sync_service_.get();
 }
 
 CloudPrintProxyService* ProfileImpl::GetCloudPrintProxyService() {
   if (!cloud_print_proxy_service_.get())
     InitCloudPrintProxyService();
   return cloud_print_proxy_service_.get();
 }
 
 void ProfileImpl::InitSyncService() {
-  network_change_notifier_thread_.reset(
-      new NetworkChangeNotifierIOThread(g_browser_process->io_thread()));
   profile_sync_factory_.reset(
-      new ProfileSyncFactoryImpl(this,
-                                 network_change_notifier_thread_.get(),
-                                 CommandLine::ForCurrentProcess()));
+      new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess()));
   sync_service_.reset(
       profile_sync_factory_->CreateProfileSyncService());
   sync_service_->Initialize();
 }
 
 void ProfileImpl::InitCloudPrintProxyService() {
   cloud_print_proxy_service_.reset(new CloudPrintProxyService(this));
   cloud_print_proxy_service_->Initialize();
 }