Clean up NetworkState members

chrome/browser/chromeos/mobile/mobile_activator.cc

 // 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.
 
 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 147 matching lines @@
 MobileActivator::MobileActivator()
     : cellular_config_(new CellularConfigDocument()),
       state_(PLAN_ACTIVATION_PAGE_LOADING),
       reenable_cert_check_(false),
       terminated_(true),
       pending_activation_request_(false),
       connection_retry_count_(0),
       initial_OTASP_attempts_(0),
       trying_OTASP_attempts_(0),
       final_OTASP_attempts_(0),
-      payment_reconnect_count_(0) {
+      payment_reconnect_count_(0),
+      weak_ptr_factory_(this) {
 }
 
 MobileActivator::~MobileActivator() {
   TerminateActivation();
 }
 
 MobileActivator* MobileActivator::GetInstance() {
   return Singleton<MobileActivator>::get();
 }
 
@@ skipping 82 matching lines @@
 
   ChangeState(network, PLAN_ACTIVATION_PAGE_LOADING, "");
 
   BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
       base::Bind(&CellularConfigDocument::LoadCellularConfigFile,
                  cellular_config_.get()),
       base::Bind(&MobileActivator::ContinueActivation, AsWeakPtr()));
 }
 
 void MobileActivator::ContinueActivation() {
-  const NetworkState* network = GetNetworkState(service_path_);
-  if (!network ||
-      (network->payment_url().empty() && network->usage_url().empty()))
+  NetworkHandler::Get()->network_configuration_handler()->GetProperties(
+      service_path_,
+      base::Bind(&MobileActivator::GetPropertiesAndContinueActivation,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&MobileActivator::GetPropertiesFailure,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void MobileActivator::GetPropertiesAndContinueActivation(
+    const std::string& service_path,
+    const base::DictionaryValue& properties) {
+  if (service_path != service_path_) {
+    NET_LOG_EVENT("MobileActivator::GetProperties received for stale network",
+                  service_path);
+    return;  // Edge case; abort.
+  }
+  const DictionaryValue* payment_dict;
+  std::string usage_url, payment_url;
+  if (!properties.GetStringWithoutPathExpansion(
+          flimflam::kUsageURLProperty, &usage_url) ||
+      !properties.GetDictionaryWithoutPathExpansion(
+          flimflam::kPaymentPortalProperty, &payment_dict) ||
+      !payment_dict->GetStringWithoutPathExpansion(
+          flimflam::kPaymentPortalURL, &payment_url)) {
+    NET_LOG_ERROR("MobileActivator missing properties", service_path_);
+    return;
+  }
+
+  if (payment_url.empty() && usage_url.empty())
     return;
 
   DisableCertRevocationChecking();
 
   // We want shill to connect us after activations, so enable autoconnect.
   DictionaryValue auto_connect_property;
   auto_connect_property.SetBoolean(flimflam::kAutoConnectProperty, true);
   NetworkHandler::Get()->network_configuration_handler()->SetProperties(
-      network->path(),
+      service_path_,
       auto_connect_property,
       base::Bind(&base::DoNothing),
       network_handler::ErrorCallback());
   StartActivation();
 }
 
+void MobileActivator::GetPropertiesFailure(
+    const std::string& error_name,
+    scoped_ptr<base::DictionaryValue> error_data) {
+  NET_LOG_ERROR("MobileActivator GetProperties Failed: " + error_name,
+                service_path_);
+}
+
 void MobileActivator::OnSetTransactionStatus(bool success) {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&MobileActivator::HandleSetTransactionStatus,
                  AsWeakPtr(), success));
 }
 
 void MobileActivator::HandleSetTransactionStatus(bool success) {
   // The payment is received, try to reconnect and check the status all over
   // again.
   if (success && state_ == PLAN_ACTIVATION_SHOWING_PAYMENT) {
@@ skipping 720 matching lines @@
   cellular_plan_payment_time_ = base::Time::Now();
 }
 
 bool MobileActivator::HasRecentCellularPlanPayment() const {
   const int kRecentPlanPaymentHours = 6;
   return (base::Time::Now() -
           cellular_plan_payment_time_).InHours() < kRecentPlanPaymentHours;
 }
 
 }  // namespace chromeos