Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/profile_sync_service.h

-// 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <string>
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class NotificationDetails;
 class NotificationSource;
 class NotificationType;
 class Profile;
 class ProfileSyncFactory;
 
-namespace chrome_common_net {
-class NetworkChangeNotifierThread;
-}
-
 // Various UI components such as the New Tab page can be driven by observing
 // the ProfileSyncService through this interface.
 class ProfileSyncServiceObserver {
  public:
   // When one of the following events occurs, OnStateChanged() is called.
   // Observers should query the service to determine what happened.
   // - We initialized successfully.
   // - There was an authentication error and the user needs to reauthenticate.
   // - The sync servers are unavailable at this time.
   // - Credentials are now in flight for authentication.
@@ skipping 74 matching lines @@
     MAX_SYNC_EVENT_CODE
   };
 
   // Default sync server URL.
   static const char* kSyncServerUrl;
   // Sync server URL for dev channel users
   static const char* kDevServerUrl;
 
   ProfileSyncService(ProfileSyncFactory* factory_,
                      Profile* profile,
-                     chrome_common_net::NetworkChangeNotifierThread*
-                         network_change_notifier_thread,
                      bool bootstrap_sync_authentication);
   virtual ~ProfileSyncService();
 
   // Initializes the object. This should be called every time an object of this
   // class is constructed.
   void Initialize();
 
   // Registers a data type controller with the sync service.  This
   // makes the data type controller available for use, it does not
   // enable or activate the synchronization of the data type (see
@@ skipping 234 matching lines @@
 
   // Time at which error UI is presented for the new tab page.
   base::TimeTicks auth_error_time_;
 
   // Factory used to create various dependent objects.
   ProfileSyncFactory* factory_;
 
   // The profile whose data we are synchronizing.
   Profile* profile_;
 
-  chrome_common_net::NetworkChangeNotifierThread*
-      network_change_notifier_thread_;
-
   // True if the profile sync service should attempt to use an LSID
   // cookie for authentication.  This is typically set to true in
   // ChromiumOS since we want to use the system level authentication
   // for sync.
   bool bootstrap_sync_authentication_;
 
   // TODO(ncarter): Put this in a profile, once there is UI for it.
   // This specifies where to find the sync server.
   GURL sync_service_url_;
 
@@ skipping 49 matching lines @@
 
   NotificationRegistrar registrar_;
 
   ScopedRunnableMethodFactory<ProfileSyncService>
     scoped_runnable_method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_