Move CellularDataPlanInfo to CellularDataPlan conversion code to cros_network_functions.cc

chrome/browser/chromeos/cros/cros_network_functions.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_CROS_CROS_NETWORK_FUNCTIONS_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_
 
 // This header is introduced to make it easy to switch from chromeos_network.cc
 // to Chrome's own DBus code.  crosbug.com/16557
 // All calls to functions in chromeos_network.h should be made through
 // functions provided by this header.
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chromeos/cros/cellular_data_plan.h"
 #include "third_party/cros/chromeos_network.h"
 
 namespace base {
 
 class DictionaryValue;
 class Value;
 
 }  // namespace base
 
 namespace chromeos {
 
 // Callback for asynchronous getters.
 typedef base::Callback<void(
     const std::string& path,
     const base::DictionaryValue* properties)> NetworkPropertiesCallback;
 
 // Callback for network properties watchers.
 typedef base::Callback<void(
     const std::string& path,
     const std::string& key,
     const base::Value& value)> NetworkPropertiesWatcherCallback;
 
+// Callback for data plan update watchers.
+typedef base::Callback<void(
+    const std::string& modem_service_path,
+    CellularDataPlanVector* data_plan_vector)> DataPlanUpdateWatcherCallback;
+
 // Base class of signal watchers.
 class CrosNetworkWatcher {
  public:
   virtual ~CrosNetworkWatcher() {}
 
  protected:
   CrosNetworkWatcher() {}
 };
 
 struct WifiAccessPoint {
@@ skipping 66 matching lines @@
     const NetworkPropertiesWatcherCallback& callback,
     const std::string& service_path);
 
 // Similar to MonitorNetworkManagerProperties for a specified network device.
 CrosNetworkWatcher* CrosMonitorNetworkDeviceProperties(
     const NetworkPropertiesWatcherCallback& callback,
     const std::string& device_path);
 
 // Sets up monitoring of the cellular data plan updates from Cashew.
 CrosNetworkWatcher* CrosMonitorCellularDataPlan(
-    MonitorDataPlanCallback callback, void* object);
+    const DataPlanUpdateWatcherCallback& callback);
 
 // Similar to MonitorNetworkManagerProperties for a specified network device.
 CrosNetworkWatcher* CrosMonitorSMS(const std::string& modem_device_path,
                                    MonitorSMSCallback callback,
                                    void* object);
 
 // Connects to the service with the |service_path|.
 // Service parameters such as authentication must already be configured.
 // Note, a successful invocation of the callback only indicates that
 // the connection process has started. You will have to query the
@@ skipping 120 matching lines @@
 // a true return code only indicates the result set was successfully read,
 // it does not imply a scan has successfully completed yet.
 bool CrosGetWifiAccessPoints(WifiAccessPointVector* result);
 
 // Configures the network service specified by |properties|.
 void CrosConfigureService(const base::DictionaryValue& properties);
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_