Move CellularDataPlanInfo to CellularDataPlan conversion code to cros_network_functions.cc

chrome/browser/chromeos/cros/network_library_impl_cros.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/cros/network_library_impl_cros.h"
 
 #include <dbus/dbus-glib.h>
 #include "base/command_line.h"
 #include "base/json/json_writer.h"  // for debug output only.
 #include "base/metrics/histogram.h"
@@ skipping 40 matching lines @@
 void NetworkLibraryImplCros::Init() {
   CHECK(CrosLibrary::Get()->libcros_loaded())
       << "libcros must be loaded before NetworkLibraryImplCros::Init()";
   // First, get the currently available networks. This data is cached
   // on the connman side, so the call should be quick.
   VLOG(1) << "Requesting initial network manager info from libcros.";
   CrosRequestNetworkManagerProperties(base::Bind(&NetworkManagerUpdate, this));
   network_manager_watcher_.reset(CrosMonitorNetworkManagerProperties(
       base::Bind(&NetworkManagerStatusChangedHandler, this)));
   data_plan_watcher_.reset(
-      CrosMonitorCellularDataPlan(&DataPlanUpdateHandler, this));
+      CrosMonitorCellularDataPlan(base::Bind(&DataPlanUpdateHandler, this)));
   // Always have at least one device obsever so that device updates are
   // always received.
   network_device_observer_.reset(new NetworkLibraryDeviceObserver());
 }
 
 bool NetworkLibraryImplCros::IsCros() const {
   return true;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ skipping 695 matching lines @@
     NetworkManagerStatusChanged(key, value);
   }
   // If there is no Profiles entry, request remembered networks here.
   if (!dict.HasKey(flimflam::kProfilesProperty))
     RequestRememberedNetworksUpdate();
 }
 
 // static
 void NetworkLibraryImplCros::DataPlanUpdateHandler(
     void* object,
-    const char* modem_service_path,
-    const chromeos::CellularDataPlanList* data_plan_list) {
-  DCHECK(CrosLibrary::Get()->libcros_loaded());
+    const std::string& modem_service_path,
+    CellularDataPlanVector* data_plan_vector) {
   NetworkLibraryImplCros* networklib =
       static_cast<NetworkLibraryImplCros*>(object);
-  DCHECK(networklib);
-  if (modem_service_path && data_plan_list) {
-    // Copy contents of |data_plan_list| from libcros to |data_plan_vector|.
-    CellularDataPlanVector* data_plan_vector = new CellularDataPlanVector;
-    for (size_t i = 0; i < data_plan_list->plans_size; ++i) {
-      const CellularDataPlanInfo* info(data_plan_list->GetCellularDataPlan(i));
-      CellularDataPlan* plan = new CellularDataPlan(*info);
-      data_plan_vector->push_back(plan);
-      VLOG(2) << " Plan: " << plan->GetPlanDesciption()
-              << " : " << plan->GetDataRemainingDesciption();
-    }
-    // |data_plan_vector| will become owned by networklib.
-    networklib->UpdateCellularDataPlan(std::string(modem_service_path),
-                                       data_plan_vector);
-  }
+  networklib->UpdateCellularDataPlan(modem_service_path, data_plan_vector);
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
 void NetworkLibraryImplCros::UpdateTechnologies(
     const ListValue* technologies, int* bitfieldp) {
   DCHECK(bitfieldp);
   if (!technologies)
     return;
   int bitfield = 0;
@@ skipping 448 matching lines @@
         // Switch back to signed settings value.
         SetCellularDataRoamingAllowed(settings_value);
       }
     }
   }
   NotifyNetworkManagerChanged(false);  // Not forced.
   AddNetworkDeviceObserver(device_path, network_device_observer_.get());
 }
 
 }  // namespace chromeos