Clean up NetworkState members

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>
 
@@ skipping 126 matching lines @@
   // We reach directly into the activator for testing purposes.
   friend class MobileActivatorTest;
 
   MobileActivator();
   virtual ~MobileActivator();
 
   // NetworkStateHandlerObserver overrides.
   virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;
   virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE;
 
-  // Continue activation after inital setup (config load).
+  // Continue activation after inital setup (config load). Makes an
+  // asynchronous call to NetworkConfigurationHandler::GetProperties.
   void ContinueActivation();
+  void GetPropertiesAndContinueActivation(
+      const std::string& service_path,
+      const base::DictionaryValue& properties);
+  void GetPropertiesFailure(const std::string& error_name,
+                            scoped_ptr<base::DictionaryValue> error_data);
   // 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);
   // Starts activation.
   void StartActivation();
   // Called after we delay our OTASP (after payment).
   void RetryOTASP();
   // Continues activation process. This method is called after we disconnect
   // due to detected connectivity issue to kick off reconnection.
@@ skipping 123 matching lines @@
   // State we will return to if we are disconnected.
   PlanActivationState post_reconnect_state_;
   // Called to continue the reconnect attempt.
   base::RepeatingTimer<MobileActivator> continue_reconnect_timer_;
   // Called when the reconnect attempt times out.
   base::OneShotTimer<MobileActivator> reconnect_timeout_timer_;
   // Cellular plan payment time.
   base::Time cellular_plan_payment_time_;
 
   ObserverList<Observer> observers_;
+  base::WeakPtrFactory<MobileActivator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MobileActivator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_MOBILE_MOBILE_ACTIVATOR_H_