Move CellularDataPlanInfo to CellularDataPlan conversion code to cros_network_functions.cc

chrome/browser/chromeos/cros/cros_network_functions.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/cros_network_functions.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/gvalue_util.h"
@@ skipping 120 matching lines @@
         ResetPropertyChangedHandler(dbus::ObjectPath(device_path_));
   }
 
  private:
   std::string device_path_;
 };
 
 // Class to watch data plan update with Libcros.
 class CrosDataPlanUpdateWatcher : public CrosNetworkWatcher {
  public:
-  CrosDataPlanUpdateWatcher(MonitorDataPlanCallback callback, void* object)
-      : monitor_(chromeos::MonitorCellularDataPlan(callback, object)) {}
+  explicit CrosDataPlanUpdateWatcher(
+      const DataPlanUpdateWatcherCallback& callback)
+      : callback_(callback),
+        monitor_(chromeos::MonitorCellularDataPlan(&OnDataPlanUpdate, this)) {}
   virtual ~CrosDataPlanUpdateWatcher() {
     chromeos::DisconnectDataPlanUpdateMonitor(monitor_);
   }
 
  private:
+  static void OnDataPlanUpdate(void* object,
+                               const char* modem_service_path,
+                               const CellularDataPlanList* data_plan_list) {
+    CrosDataPlanUpdateWatcher* watcher =
+        static_cast<CrosDataPlanUpdateWatcher*>(object);
+    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 be owned by callback.
+      watcher->callback_.Run(modem_service_path, data_plan_vector);
+    }
+  }
+
+  DataPlanUpdateWatcherCallback callback_;
   DataPlanUpdateMonitor monitor_;
 };
 
 // Class to watch sms with Libcros.
 class CrosSMSWatcher : public CrosNetworkWatcher {
  public:
   CrosSMSWatcher(const std::string& modem_device_path,
                  MonitorSMSCallback callback,
                  void* object)
       : monitor_(chromeos::MonitorSMS(modem_device_path.c_str(),
@@ skipping 231 matching lines @@
 CrosNetworkWatcher* CrosMonitorNetworkDeviceProperties(
     const NetworkPropertiesWatcherCallback& callback,
     const std::string& device_path) {
   if (g_libcros_network_functions_enabled)
     return new CrosNetworkDevicePropertiesWatcher(callback, device_path);
   else
     return new NetworkDevicePropertiesWatcher(callback, device_path);
 }
 
 CrosNetworkWatcher* CrosMonitorCellularDataPlan(
-    MonitorDataPlanCallback callback, void* object) {
-  return new CrosDataPlanUpdateWatcher(callback, object);
+    const DataPlanUpdateWatcherCallback& callback) {
+  return new CrosDataPlanUpdateWatcher(callback);
 }
 
 CrosNetworkWatcher* CrosMonitorSMS(const std::string& modem_device_path,
                                    MonitorSMSCallback callback,
                                    void* object) {
   return new CrosSMSWatcher(modem_device_path, callback, object);
 }
 
 void CrosRequestNetworkServiceConnect(const std::string& service_path,
                                       NetworkActionCallback callback,
@@ skipping 485 matching lines @@
     ScopedGHashTable ghash(
         ConvertDictionaryValueToStringValueGHashTable(properties));
     chromeos::ConfigureService("", ghash.get(), OnConfigureService, NULL);
   } else {
     DBusThreadManager::Get()->GetFlimflamManagerClient()->ConfigureService(
         properties, base::Bind(&DoNothing));
   }
 }
 
 }  // namespace chromeos