Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/profile.h

 // 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILE_H_
 #define CHROME_BROWSER_PROFILE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/spellcheck_host_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/preferences.h"
 #endif
 
-namespace chrome_common_net {
-class NetworkChangeNotifierThread;
-}
-
 namespace history {
 class TopSites;
 }
 
 namespace net {
 class TransportSecurityState;
 class SSLConfigService;
 }
 
 namespace webkit_database {
@@ skipping 559 matching lines @@
   scoped_refptr<TransportSecurityPersister>
       transport_security_persister_;
   scoped_ptr<PrefService> prefs_;
   scoped_refptr<ThumbnailStore> thumbnail_store_;
   scoped_ptr<TemplateURLFetcher> template_url_fetcher_;
   scoped_ptr<TemplateURLModel> template_url_model_;
   scoped_ptr<BookmarkModel> bookmark_bar_model_;
   scoped_refptr<WebResourceService> web_resource_service_;
   scoped_ptr<NTPResourceCache> ntp_resource_cache_;
 
-  // Used by |profile_sync_factory_|.
-  scoped_ptr<chrome_common_net::NetworkChangeNotifierThread>
-      network_change_notifier_thread_;
   scoped_ptr<ProfileSyncFactory> profile_sync_factory_;
   scoped_ptr<ProfileSyncService> sync_service_;
   scoped_ptr<CloudPrintProxyService> cloud_print_proxy_service_;
 
   scoped_refptr<ChromeURLRequestContextGetter> request_context_;
 
   scoped_refptr<ChromeURLRequestContextGetter> media_request_context_;
 
   scoped_refptr<ChromeURLRequestContextGetter> extensions_request_context_;
 
@@ skipping 56 matching lines @@
   scoped_refptr<history::TopSites> top_sites_;  // For history and thumbnails.
 
 #if defined(OS_CHROMEOS)
   chromeos::Preferences chromeos_preferences_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_H_