commit bc6234d9cf3b56d51bb5f5a5706716bbaf68d10f
author Steven Bennetts <stevenjb@chromium.org> Tue Jan 17 23:20:57 2012
committer Gerrit <chrome-bot@google.com> Mon Jan 23 22:13:16 2012
tree 3e12ccee3b9282f420c2125063149b3e2f154b07
parent 9184a581bc66265feb8d0364a74b436e504f5f23

Deprecate unused functions in chromeos_network.cc

These have not been used in Chrome for a very long time.

BUG=none
TEST=build libcros, chrome+libcros

Change-Id: I19a65de6acd7d6f55afbf77e455f7424d89eeabc
Reviewed-on: https://gerrit.chromium.org/gerrit/14336
Tested-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Ready: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Satoru Takabayashi <satorux@chromium.org>

chromeos_cros_api.h

diff --git a/chromeos_cros_api.h b/chromeos_cros_api.h
index b5c4d00..b5cfc9a 100644
--- a/chromeos_cros_api.h
+++ b/chromeos_cros_api.h
@@ -341,12 +341,14 @@
 //      NotifyScreenUnlockRequested, NotifyScreenUnlockCompleted.
 // 188: Deprecated GetWifiService, ConfigureWifiService, FreeServiceInfo.
 // 189: Removed GetWifiService, ConfigureWifiService, FreeServiceInfo.
+// 190: Deprecated DisconnectFromNetwork, SetAutoConnect, SetPassphrase,
+//      SetIdentity.
 
 namespace chromeos {  // NOLINT
 
 enum CrosAPIVersion {
   kCrosAPIMinVersion = 188,
-  kCrosAPIVersion = 189
+  kCrosAPIVersion = 190
 };
 
 // Default path to pass to LoadCros: "/opt/google/chrome/chromeos/libcros.so"

chromeos_network.cc

diff --git a/chromeos_network.cc b/chromeos_network.cc
index 1bd5c93..b435f7f 100644
--- a/chromeos_network.cc
+++ b/chromeos_network.cc
@@ -619,6 +619,7 @@
   return true;
 }
 
+// Deprecated
 extern "C"
 bool ChromeOSSetAutoConnect(const char* service_path, bool auto_connect) {
   dbus::Proxy service_proxy(dbus::GetSystemBusConnection(),
@@ -697,6 +698,7 @@
 }
 
 
+// Deprecated
 extern "C"
 bool ChromeOSSetPassphrase(const char* service_path, const char* passphrase) {
   if (passphrase && strlen(passphrase) > 0) {
@@ -707,6 +709,7 @@
   }
 }
 
+// Deprecated
 extern "C"
 bool ChromeOSSetIdentity(const char* service_path, const char* identity) {
   return SetServiceStringProperty(service_path, kIdentityProperty, identity);

chromeos_network.h

diff --git a/chromeos_network.h b/chromeos_network.h
index 5043fab..eca01c1 100644
--- a/chromeos_network.h
+++ b/chromeos_network.h
@@ -152,9 +152,6 @@
 extern void (*DeleteServiceFromProfile)(const char* profile_path,
                                         const char* service_path);
 
-// Disconnects from the network with the |service_path|.
-extern bool (*DisconnectFromNetwork)(const char* service_path);
-
 // Request an update of the data plans. A callback will be received by any
 // object that invoked MonitorCellularDataPlan when up to date data is ready.
 extern void (*RequestCellularDataPlanUpdate)(const char* modem_service_path);
@@ -368,21 +365,6 @@
 // Returns false on failure and true on success.
 extern bool (*SetOfflineMode)(bool offline);
 
-// Set auto_connect for service.
-//
-// Returns true on success.
-extern bool (*SetAutoConnect)(const char* service_path, bool auto_connect);
-
-// Set passphrase for service.
-//
-// Returns true on success.
-extern bool (*SetPassphrase)(const char* service_path, const char* passphrase);
-
-// Set security identity for service.
-//
-// Returns true on success.
-extern bool (*SetIdentity)(const char* service_path, const char* identity);
-
 // Gets a list of all the IPConfigs using a given device path
 extern IPConfigStatus* (*ListIPConfigs)(const char* device_path);
 

load.cc

diff --git a/load.cc b/load.cc
index b39ecbe..13470d8 100644
--- a/load.cc
+++ b/load.cc
@@ -116,7 +116,6 @@
 DECL_FUNC_3(SetNetworkIPConfigPropertyGValue, void, const char*, const char*,
             const GValue*);
 DECL_FUNC_2(DeleteServiceFromProfile, void, const char*, const char*);
-DECL_FUNC_1(DisconnectFromNetwork, bool, const char*);
 DECL_FUNC_1(RequestCellularDataPlanUpdate, void, const char*);
 DECL_FUNC_2(MonitorNetworkManagerProperties, NetworkPropertiesMonitor,
             MonitorPropertyGValueCallback, void*);
@@ -162,9 +161,6 @@
 DECL_FUNC_4(RequestCellularRegister, void, const char*, const char*,
             NetworkActionCallback, void*);
 DECL_FUNC_1(SetOfflineMode, bool, bool);
-DECL_FUNC_2(SetAutoConnect, bool, const char*, bool);
-DECL_FUNC_2(SetPassphrase, bool, const char*, const char*);
-DECL_FUNC_2(SetIdentity, bool, const char*, const char*);
 DECL_FUNC_1(ListIPConfigs, IPConfigStatus*, const char*);
 DECL_FUNC_2(AddIPConfig, bool, const char*, IPConfigType);
 DECL_FUNC_1(RemoveIPConfig, bool, IPConfig*);
@@ -281,7 +277,6 @@
   INIT_FUNC(SetNetworkDevicePropertyGValue);
   INIT_FUNC(SetNetworkIPConfigPropertyGValue);
   INIT_FUNC(DeleteServiceFromProfile);
-  INIT_FUNC(DisconnectFromNetwork);
   INIT_FUNC(RequestCellularDataPlanUpdate);
   INIT_FUNC(MonitorNetworkManagerProperties);
   INIT_FUNC(MonitorNetworkServiceProperties);
@@ -310,9 +305,6 @@
   INIT_FUNC(ProposeScan);
   INIT_FUNC(RequestCellularRegister);
   INIT_FUNC(SetOfflineMode);
-  INIT_FUNC(SetAutoConnect);
-  INIT_FUNC(SetPassphrase);
-  INIT_FUNC(SetIdentity);
   INIT_FUNC(ListIPConfigs);
   INIT_FUNC(AddIPConfig);
   INIT_FUNC(RemoveIPConfig);