Call libcros functions through proxy functions

BUG=chromium-os:16557
TEST=build success


Review URL: http://codereview.chromium.org/9702005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126859 0039d316-1c4b-4281-b951-d872f2087c98

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"
+
+namespace chromeos {
+
+bool CrosActivateCellularModem(const char* service_path, const char* carrier) {
+  return chromeos::ActivateCellularModem(service_path, carrier);
+}
+
+void CrosSetNetworkServicePropertyGValue(const char* service_path,
+                                         const char* property,
+                                         const GValue* gvalue) {
+  chromeos::SetNetworkServicePropertyGValue(service_path, property, gvalue);
+}
+
+void CrosClearNetworkServiceProperty(const char* service_path,
+                                     const char* property) {
+  chromeos::ClearNetworkServiceProperty(service_path, property);
+}
+
+void CrosSetNetworkDevicePropertyGValue(const char* device_path,
+                                        const char* property,
+                                        const GValue* gvalue) {
+  chromeos::SetNetworkDevicePropertyGValue(device_path, property, gvalue);
+}
+
+void CrosSetNetworkIPConfigPropertyGValue(const char* ipconfig_path,
+                                          const char* property,
+                                          const GValue* gvalue) {
+  chromeos::SetNetworkIPConfigPropertyGValue(ipconfig_path, property, gvalue);
+}
+
+void CrosDeleteServiceFromProfile(const char* profile_path,
+                                  const char* service_path) {
+  chromeos::DeleteServiceFromProfile(profile_path, service_path);
+}
+
+void CrosRequestCellularDataPlanUpdate(const char* modem_service_path) {
+  chromeos::RequestCellularDataPlanUpdate(modem_service_path);
+}
+
+NetworkPropertiesMonitor CrosMonitorNetworkManagerProperties(
+    MonitorPropertyGValueCallback callback,
+    void* object) {
+  return chromeos::MonitorNetworkManagerProperties(callback, object);
+}
+
+NetworkPropertiesMonitor CrosMonitorNetworkServiceProperties(
+    MonitorPropertyGValueCallback callback,
+    const char* service_path,
+    void* object) {
+  return chromeos::MonitorNetworkServiceProperties(
+      callback, service_path, object);
+}
+
+NetworkPropertiesMonitor CrosMonitorNetworkDeviceProperties(
+    MonitorPropertyGValueCallback callback,
+    const char* device_path,
+    void* object) {
+  return chromeos::MonitorNetworkDeviceProperties(
+      callback, device_path, object);
+}
+
+void CrosDisconnectNetworkPropertiesMonitor(
+    NetworkPropertiesMonitor monitor) {
+  DisconnectNetworkPropertiesMonitor(monitor);
+}
+
+DataPlanUpdateMonitor CrosMonitorCellularDataPlan(
+    MonitorDataPlanCallback callback,
+    void* object) {
+  return chromeos::MonitorCellularDataPlan(callback, object);
+}
+
+void CrosDisconnectDataPlanUpdateMonitor(DataPlanUpdateMonitor monitor) {
+  chromeos::DisconnectDataPlanUpdateMonitor(monitor);
+}
+
+SMSMonitor CrosMonitorSMS(const char* modem_device_path,
+                          MonitorSMSCallback callback,
+                          void* object) {
+  return chromeos::CrosMonitorSMS(modem_device_path, callback, object);
+}
+
+void CrosDisconnectSMSMonitor(SMSMonitor monitor) {
+  chromeos::DisconnectSMSMonitor(monitor);
+}
+
+void CrosRequestNetworkServiceConnect(const char* service_path,
+                                      NetworkActionCallback callback,
+                                      void* object) {
+  chromeos::RequestNetworkServiceConnect(service_path, callback, object);
+}
+
+void CrosRequestNetworkManagerProperties(
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestNetworkManagerProperties(callback, object);
+}
+
+void CrosRequestNetworkServiceProperties(
+    const char* service_path,
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestNetworkServiceProperties(service_path, callback, object);
+}
+
+void CrosRequestNetworkDeviceProperties(
+    const char* device_path,
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestNetworkDeviceProperties(device_path, callback, object);
+}
+
+void CrosRequestNetworkProfileProperties(
+    const char* profile_path,
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestNetworkProfileProperties(profile_path, callback, object);
+}
+
+void CrosRequestNetworkProfileEntryProperties(
+    const char* profile_path,
+    const char* profile_entry_path,
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestNetworkProfileEntryProperties(
+      profile_path, profile_entry_path, callback, object);
+}
+
+void CrosRequestHiddenWifiNetworkProperties(
+    const char* ssid,
+    const char* security,
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestHiddenWifiNetworkProperties(
+      ssid, security, callback, object);
+}
+
+void CrosRequestVirtualNetworkProperties(
+    const char* service_name,
+    const char* server_hostname,
+    const char* provider_type,
+    NetworkPropertiesGValueCallback callback,
+    void* object) {
+  chromeos::RequestVirtualNetworkProperties(service_name, server_hostname,
+                                            provider_type, callback, object);
+}
+
+void CrosRequestNetworkServiceDisconnect(const char* service_path) {
+  chromeos::RequestNetworkServiceDisconnect(service_path);
+}
+
+void CrosRequestRemoveNetworkService(const char* service_path) {
+  chromeos::RequestRemoveNetworkService(service_path);
+}
+
+void CrosRequestNetworkScan(const char* network_type) {
+  chromeos::RequestNetworkScan(network_type);
+}
+
+void CrosRequestNetworkDeviceEnable(const char* network_type, bool enable) {
+  chromeos::RequestNetworkDeviceEnable(network_type, enable);
+}
+
+void CrosRequestRequirePin(const char* device_path,
+                           const char* pin,
+                           bool enable,
+                           NetworkActionCallback callback,
+                           void* object) {
+  chromeos::RequestRequirePin(device_path, pin, enable, callback, object);
+}
+
+void CrosRequestEnterPin(const char* device_path,
+                         const char* pin,
+                         NetworkActionCallback callback,
+                         void* object) {
+  chromeos::RequestEnterPin(device_path, pin, callback, object);
+}
+
+void CrosRequestUnblockPin(const char* device_path,
+                           const char* unblock_code,
+                           const char* pin,
+                           NetworkActionCallback callback,
+                           void* object) {
+  chromeos::RequestUnblockPin(device_path, unblock_code, pin, callback, object);
+}
+
+void CrosRequestChangePin(const char* device_path,
+                          const char* old_pin,
+                          const char* new_pin,
+                          NetworkActionCallback callback,
+                          void* object) {
+  chromeos::RequestChangePin(device_path, old_pin, new_pin, callback, object);
+}
+
+void CrosProposeScan(const char* device_path) {
+  chromeos::ProposeScan(device_path);
+}
+
+void CrosRequestCellularRegister(const char* device_path,
+                                 const char* network_id,
+                                 chromeos::NetworkActionCallback callback,
+                                 void* object) {
+  chromeos::RequestCellularRegister(device_path, network_id, callback, object);
+}
+
+bool CrosSetOfflineMode(bool offline) {
+  return chromeos::SetOfflineMode(offline);
+}
+
+IPConfigStatus* CrosListIPConfigs(const char* device_path) {
+  return chromeos::ListIPConfigs(device_path);
+}
+
+bool CrosAddIPConfig(const char* device_path, IPConfigType type) {
+  return chromeos::AddIPConfig(device_path, type);
+}
+
+bool CrosRemoveIPConfig(IPConfig* config) {
+  return chromeos::RemoveIPConfig(config);
+}
+
+void CrosFreeIPConfigStatus(IPConfigStatus* status) {
+  chromeos::FreeIPConfigStatus(status);
+}
+
+DeviceNetworkList* CrosGetDeviceNetworkList() {
+  return chromeos::GetDeviceNetworkList();
+}
+
+void CrosFreeDeviceNetworkList(DeviceNetworkList* network_list) {
+  chromeos::FreeDeviceNetworkList(network_list);
+}
+
+void CrosConfigureService(const char* identifier,
+                          const GHashTable* properties,
+                          NetworkActionCallback callback,
+                          void* object) {
+  chromeos::ConfigureService(identifier, properties, callback, object);
+}
+
+}  // namespace chromeos

chrome/browser/chromeos/cros/network_library.cc

@@ -305,7 +305,7 @@ void Network::SetValueProperty(const char* prop, Value* value) {
     return;
   scoped_ptr<GValue> gvalue(
       NetworkLibraryImplCros::ConvertValueToGValue(value));
-  chromeos::SetNetworkServicePropertyGValue(
+  CrosSetNetworkServicePropertyGValue(
       service_path_.c_str(), prop, gvalue.get());
 }
 
@@ -313,7 +313,7 @@ void Network::ClearProperty(const char* prop) {
   DCHECK(prop);
   if (!EnsureCrosLoaded())
     return;
-  chromeos::ClearNetworkServiceProperty(service_path_.c_str(), prop);
+  CrosClearNetworkServiceProperty(service_path_.c_str(), prop);
 }
 
 void Network::SetStringProperty(
@@ -486,8 +486,7 @@ void Network::InitIPAddress() {
     return;
   // If connected, get ip config.
   if (connected() && !device_path_.empty()) {
-    IPConfigStatus* ipconfig_status =
-        chromeos::ListIPConfigs(device_path_.c_str());
+    IPConfigStatus* ipconfig_status = CrosListIPConfigs(device_path_.c_str());
     if (ipconfig_status) {
       for (int i = 0; i < ipconfig_status->size; ++i) {
         IPConfig ipconfig = ipconfig_status->ips[i];
@@ -496,7 +495,7 @@ void Network::InitIPAddress() {
           break;
         }
       }
-      chromeos::FreeIPConfigStatus(ipconfig_status);
+      CrosFreeIPConfigStatus(ipconfig_status);
     }
   }
 }
@@ -1000,7 +999,7 @@ CellularNetwork::~CellularNetwork() {
 bool CellularNetwork::StartActivation() {
   if (!EnsureCrosLoaded())
     return false;
-  if (!chromeos::ActivateCellularModem(service_path().c_str(), NULL))
+  if (!CrosActivateCellularModem(service_path().c_str(), NULL))
     return false;
   // Don't wait for flimflam to tell us that we are really activating since
   // other notifications in the message loop might cause us to think that
@@ -1013,7 +1012,7 @@ void CellularNetwork::RefreshDataPlansIfNeeded() const {
   if (!EnsureCrosLoaded())
     return;
   if (connected() && activated())
-    chromeos::RequestCellularDataPlanUpdate(service_path().c_str());
+    CrosRequestCellularDataPlanUpdate(service_path().c_str());
 }
 
 void CellularNetwork::SetApn(const CellularApn& apn) {

chrome/browser/chromeos/cros/network_library.h

@@ -18,9 +18,9 @@
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/cros/cros_network_functions.h"
 #include "chrome/browser/chromeos/cros/network_ui_data.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/cros/chromeos_network.h"
 
 namespace base {
 class DictionaryValue;

chrome/browser/chromeos/sms_observer.cc

@@ -44,7 +44,7 @@ void SmsObserver::UpdateObservers(NetworkLibrary* library) {
     }
     if (!found) {
       VLOG(1) << "Remove SMS monitor for " << it_observer->first;
-      chromeos::DisconnectSMSMonitor(it_observer->second);
+      CrosDisconnectSMSMonitor(it_observer->second);
       observers_.erase(it_observer++);
     } else {
       ++it_observer;
@@ -64,7 +64,7 @@ void SmsObserver::UpdateObservers(NetworkLibrary* library) {
     if (it_observer == observers_.end()) {
       VLOG(1) << "Add SMS monitor for " << device_path;
       chromeos::SMSMonitor monitor =
-          chromeos::MonitorSMS(device_path.c_str(), &StaticCallback, this);
+          CrosMonitorSMS(device_path.c_str(), &StaticCallback, this);
       observers_.insert(ObserversMap::value_type(device_path, monitor));
     } else {
       VLOG(1) << "Already has SMS monitor for " << device_path;
@@ -80,7 +80,7 @@ void SmsObserver::DisconnectAll() {
   for (ObserversMap::iterator it = observers_.begin();
        it != observers_.end(); ++it) {
     VLOG(1) << "Remove SMS monitor for " << it->first;
-    chromeos::DisconnectSMSMonitor(it->second);
+    CrosDisconnectSMSMonitor(it->second);
   }
   observers_.clear();
 }

chrome/chrome_browser.gypi

@@ -425,6 +425,8 @@
         'browser/chromeos/cros/cert_library.h',
         'browser/chromeos/cros/cros_library.cc',
         'browser/chromeos/cros/cros_library.h',
+        'browser/chromeos/cros/cros_network_functions.cc',
+        'browser/chromeos/cros/cros_network_functions.h',
         'browser/chromeos/cros/cryptohome_library.cc',
         'browser/chromeos/cros/cryptohome_library.h',
         'browser/chromeos/cros/enum_mapper.h',