Move CellularDataPlanInfo to CellularDataPlan conversion code to cros_network_functions.cc

chrome/browser/chromeos/cros/cros_network_functions.h

Index: chrome/browser/chromeos/cros/cros_network_functions.h
diff --git a/chrome/browser/chromeos/cros/cros_network_functions.h b/chrome/browser/chromeos/cros/cros_network_functions.h
index ab1038726871fde1065b5eb6678ac818f0d3dfa8..73c7d8555fd137c49bba31bcdad98d4b2a4a14ab 100644
--- a/chrome/browser/chromeos/cros/cros_network_functions.h
+++ b/chrome/browser/chromeos/cros/cros_network_functions.h
@@ -14,6 +14,7 @@
 
 #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 {
@@ -36,6 +37,11 @@ typedef base::Callback<void(
     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:
@@ -122,7 +128,7 @@ CrosNetworkWatcher* CrosMonitorNetworkDeviceProperties(
 
 // 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,