Implement SetNetworkDeviceProperty() and ClearNetworkDeviceProperty().

chromeos_network.cc

Index: chromeos_network.cc
diff --git a/chromeos_network.cc b/chromeos_network.cc
index afbff804479054e2ec1baee4e467b3ce7c795011..34b6dc8c7356888b294ba9193463ca4340e7237f 100644
--- a/chromeos_network.cc
+++ b/chromeos_network.cc
@@ -1916,28 +1916,9 @@ static glib::Value *ConvertToGlibValue(const ::Value* value) {
   return NULL;
 }
 
-
-extern "C"
-void ChromeOSSetNetworkServiceProperty(const char* service_path,
-                                       const char* property,
-                                       const ::Value* setting) {
-  FlimflamCallbackData* cb_data =
-      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
-
-  // DEPRECATED
-  // Backwards-compatibility for "CertPath=SETTINGS:key_id=1,cert_id=2,..."
-  if (strcmp(property, "CertPath") == 0) {
-    std::string certpath;
-    if (setting->GetAsString(&certpath)) {
-      // Synchronous call for backwards compatibility.
-      // TODO(njw): remove once CertPath is deprecated in favor of
-      // explicit EAP.* properties.
-      set_certpath_properties(certpath.c_str(), cb_data->proxy.get());
-    }
-    delete cb_data;
-    return;
-  }
-
+static void SetNetworkProperty(FlimflamCallbackData *cb_data,
+                               const char* property,
+                               const ::Value* setting) {
   // Start the DBus call. FlimflamNotifyHandleError will get called when
   // it completes and log any errors.
   scoped_ptr<glib::Value> gsetting(ConvertToGlibValue(setting));
@@ -1958,12 +1939,8 @@ void ChromeOSSetNetworkServiceProperty(const char* service_path,
   }
 }
 
-extern "C"
-void ChromeOSClearNetworkServiceProperty(const char* service_path,
-                                         const char* property) {
-  FlimflamCallbackData* cb_data =
-      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
-
+static void ClearNetworkProperty(FlimflamCallbackData *cb_data,
+                                 const char* property) {
   // Start the DBus call. FlimflamNotifyHandleError will get called when
   // it completes and log any errors.
   DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call(
@@ -1981,6 +1958,58 @@ void ChromeOSClearNetworkServiceProperty(const char* service_path,
   }
 }
 
+extern "C"
+void ChromeOSSetNetworkServiceProperty(const char* service_path,
+                                       const char* property,
+                                       const ::Value* setting) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
+
+  // DEPRECATED
+  // Backwards-compatibility for "CertPath=SETTINGS:key_id=1,cert_id=2,..."
+  if (strcmp(property, "CertPath") == 0) {
+    std::string certpath;
+    if (setting->GetAsString(&certpath)) {
+      // Synchronous call for backwards compatibility.
+      // TODO(njw): remove once CertPath is deprecated in favor of
+      // explicit EAP.* properties.
+      set_certpath_properties(certpath.c_str(), cb_data->proxy.get());
+    }
+    delete cb_data;
+    return;
+  }
+
+  SetNetworkProperty(cb_data, property, setting);
+}
+
+extern "C"
+void ChromeOSClearNetworkServiceProperty(const char* service_path,
+                                         const char* property) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
+
+  ClearNetworkProperty(cb_data, property);
+}
+
+extern "C"
+void ChromeOSSetNetworkDeviceProperty(const char* device_path,
+                                      const char* property,
+                                      const ::Value* setting) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamDeviceInterface, device_path);
+
+  SetNetworkProperty(cb_data, property, setting);
+}
+
+extern "C"
+void ChromeOSClearNetworkDeviceProperty(const char* device_path,
+                                        const char* property) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamDeviceInterface, device_path);
+
+  ClearNetworkProperty(cb_data, property);
+}
+
 // Cashew services
 
 extern "C"