Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/mobile/mobile_activator.h

 // Copyright (c) 2012 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_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_
 #define CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 class TestMobileActivator;
 
 // Cellular plan config document.
 class CellularConfigDocument
     : public base::RefCountedThreadSafe<CellularConfigDocument> {
  public:
@@ skipping 15 matching lines @@
 
   std::string version_;
   ErrorMap error_map_;
   base::Lock config_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(CellularConfigDocument);
 };
 
 // This class performs mobile plan activation process.
 class MobileActivator
-  : public NetworkLibrary::NetworkManagerObserver,
+  : public ConnectivityStateHelperObserver,
     public NetworkLibrary::NetworkObserver,
     public base::SupportsWeakPtr<MobileActivator> {
  public:
   // Activation state.
   enum PlanActivationState {
     // Activation WebUI page is loading, activation not started.
     PLAN_ACTIVATION_PAGE_LOADING            = -1,
     // Activation process started.
     PLAN_ACTIVATION_START                   = 0,
     // Initial over the air activation attempt.
@@ skipping 60 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(MobileActivatorTest, OTASPScheduling);
   FRIEND_TEST_ALL_PREFIXES(MobileActivatorTest,
                            ReconnectOnDisconnectFromPaymentPortal);
   FRIEND_TEST_ALL_PREFIXES(MobileActivatorTest, StartAtStart);
   // We reach directly into the activator for testing purposes.
   friend class MobileActivatorTest;
 
   MobileActivator();
   virtual ~MobileActivator();
 
-  // NetworkLibrary::NetworkManagerObserver overrides.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
+  // ConnectivityStateHelperObserver overrides.
+  virtual void NetworkManagerChanged() OVERRIDE;
   // NetworkLibrary::NetworkObserver overrides.
   virtual void OnNetworkChanged(NetworkLibrary* obj,
                                 const Network* network) OVERRIDE;
 
   // Continue activation after inital setup (config load).
   void ContinueActivation();
   // Handles the signal that the payment portal has finished loading.
   void HandlePortalLoaded(bool success);
   // Handles the signal that the user has finished with the portal.
   void HandleSetTransactionStatus(bool success);
@@ skipping 105 matching lines @@
 
 
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MobileActivator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_