Libcros changes for issue_12743: Add async RequestUpdateCheck call.

chromeos_network.cc

 // Copyright (c) 2009 The Chromium OS 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 "chromeos_network.h"  // NOLINT
 
 #include <algorithm>
 #include <cstring>
 #include <list>
 #include <set>
@@ skipping 1234 matching lines @@
   delete list;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // Flimflam asynchronous interface code
 
 namespace {
 
 struct FlimflamCallbackData {
   FlimflamCallbackData(const char* interface,
-                       const char* service_path) {
-    DCHECK(interface);
-    interface_name = std::string(interface);
-    proxy = new dbus::Proxy(dbus::GetSystemBusConnection(),
+                       const char* service_path) :

[petkov, 2011/03/09 00:32:09]

style says the colon should be on the next line, i think

+      proxy(new dbus::Proxy(dbus::GetSystemBusConnection(),
                             kFlimflamServiceName,
                             service_path,
-                            interface);
-  }
-  virtual ~FlimflamCallbackData() {
-    delete proxy;
-  }
-  // Owned by the callback, deleteted in the destructor:
-  dbus::Proxy* proxy;
+                            interface)),
+      interface_name(interface) {}
+  scoped_ptr<dbus::Proxy> proxy;
   std::string interface_name;  // Store for error reporting.
 };
 
 // DBus will always call the Delete function passed to it by
 // dbus_g_proxy_begin_call, whether DBus calls the callback or not.
 void DeleteFlimflamCallbackData(void* user_data) {
   FlimflamCallbackData* cb_data = static_cast<FlimflamCallbackData*>(user_data);
   delete cb_data;  // virtual destructor.
 }
 
@@ skipping 14 matching lines @@
 }
 
 struct GetPropertiesCallbackData : public FlimflamCallbackData {
   GetPropertiesCallbackData(const char* interface,
                             const char* service_path,
                             const char* cb_path,
                             NetworkPropertiesCallback cb,
                             void* obj) :
       FlimflamCallbackData(interface, service_path),
       callback(cb),
-      object(obj) {
-    callback_path = NewStringCopy(cb_path);
-  }
-  virtual ~GetPropertiesCallbackData() {
-    delete callback_path;
-  }
-
+      object(obj),
+      callback_path(cb_path) {}
   // Owned by the caller (i.e. Chrome), do not destroy them:
   NetworkPropertiesCallback callback;
   void* object;
   // Owned by the callback, deleteted in the destructor:
-  const char* callback_path;
+  std::string callback_path;
 };
 
 void GetPropertiesNotify(DBusGProxy* gproxy,
                          DBusGProxyCall* call_id,
                          void* user_data) {
   GetPropertiesCallbackData* cb_data =
       static_cast<GetPropertiesCallbackData*>(user_data);
   DCHECK(cb_data);
   glib::ScopedError error;
   glib::ScopedHashTable properties;
   if (!::dbus_g_proxy_end_call(
           gproxy,
           call_id,
           &Resetter(&error).lvalue(),
           ::dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
           &Resetter(&properties).lvalue(),
           G_TYPE_INVALID)) {
     LOG(WARNING) << "GetPropertiesNotify for path: '"
                  << cb_data->callback_path << "' error: "
                  << (error->message ? error->message : "Unknown Error.");
-    cb_data->callback(cb_data->object, cb_data->callback_path, NULL);
+    cb_data->callback(cb_data->object,
+                      cb_data->callback_path.c_str(),
+                      NULL);
   } else {
     scoped_ptr<Value> value(ConvertGHashTable(properties.get()));
-    cb_data->callback(cb_data->object, cb_data->callback_path, value.get());
+    cb_data->callback(cb_data->object,
+                      cb_data->callback_path.c_str(),
+                      value.get());
   }
 }
 
 void GetPropertiesAsync(const char* interface,
                         const char* service_path,
                         NetworkPropertiesCallback callback,
                         void* object) {
   DCHECK(interface && service_path  && callback);
   GetPropertiesCallbackData* cb_data = new GetPropertiesCallbackData(
       interface, service_path, service_path, callback, object);
@@ skipping 47 matching lines @@
   if (!::dbus_g_proxy_end_call(
           gproxy,
           call_id,
           &Resetter(&error).lvalue(),
           DBUS_TYPE_G_OBJECT_PATH,
           &service_path,
           G_TYPE_INVALID)) {
     LOG(WARNING) << "GetWifiNotify for path: '"
                  << cb_data->callback_path << "' error: "
                  << (error->message ? error->message : "Unknown Error.");
-    cb_data->callback(cb_data->object, cb_data->callback_path, NULL);
+    cb_data->callback(cb_data->object, cb_data->callback_path.c_str(), NULL);
   } else {
     // Now request the properties for the service.
     GetPropertiesAsync(kFlimflamServiceInterface,
                        service_path,
                        cb_data->callback,
                        cb_data->object);
   }
 }
 
 struct NetworkActionCallbackData : public FlimflamCallbackData {
   NetworkActionCallbackData(const char* interface,
                             const char* service_path,
                             const char* cb_path,
                             NetworkActionCallback cb,
                             void* obj) :
       FlimflamCallbackData(interface, service_path),
       callback(cb),
-      object(obj) {
-    callback_path = NewStringCopy(cb_path);
-  }
-  virtual ~NetworkActionCallbackData() {
-    delete callback_path;
-  }
-
+      object(obj),
+      callback_path(cb_path) {}
   // Owned by the caller (i.e. Chrome), do not destroy them:
   NetworkActionCallback callback;
   void* object;
   // Owned by the callback, deleteted in the destructor:
-  const char* callback_path;
+  std::string callback_path;
 };
 
 void NetworkServiceConnectNotify(DBusGProxy* gproxy,
                                  DBusGProxyCall* call_id,
                                  void* user_data) {
   NetworkActionCallbackData* cb_data =
       static_cast<NetworkActionCallbackData*>(user_data);
   DCHECK(cb_data);
   glib::ScopedError error;
   if (!::dbus_g_proxy_end_call(
           gproxy,
           call_id,
           &Resetter(&error).lvalue(),
           G_TYPE_INVALID)) {
     NetworkMethodErrorType etype;
     if (error->domain == DBUS_GERROR &&
         error->code == DBUS_GERROR_REMOTE_EXCEPTION) {
       etype = NETWORK_METHOD_ERROR_REMOTE;
     } else {
       LOG(WARNING) << "NetworkServiceConnectNotify for path: '"
                    << cb_data->callback_path << "' error: "
                    << (error->message ? error->message : "Unknown Error.");
       etype = NETWORK_METHOD_ERROR_LOCAL;
     }
-    cb_data->callback(cb_data->object, cb_data->callback_path,
+    cb_data->callback(cb_data->object, cb_data->callback_path.c_str(),
                       etype, error->message);
   } else {
-    cb_data->callback(cb_data->object, cb_data->callback_path,
+    cb_data->callback(cb_data->object, cb_data->callback_path.c_str(),
                       NETWORK_METHOD_ERROR_NONE, NULL);
   }
 }
 
 void NetworkServiceConnectAsync(
     const char* service_path,
     NetworkActionCallback callback,
     void* object) {
   DCHECK(service_path && callback);
   NetworkActionCallbackData* cb_data = new NetworkActionCallbackData(
@@ skipping 197 matching lines @@
       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);
+      set_certpath_properties(certpath.c_str(), cb_data->proxy.get());
     }
     delete cb_data;
     return;
   }
 
   // Start the DBus call. FlimflamNotifyHandleError will get called when
   // it completes and log any errors.
   scoped_ptr<glib::Value> gsetting(ConvertToGlibValue(setting));
   DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call(
       cb_data->proxy->gproxy(),
@@ skipping 170 matching lines @@
   }
   DCHECK(properties_array);
 
   CellularDataPlanList *data_plan_list =
       ParseCellularDataPlanList(properties_array);
   g_ptr_array_unref(properties_array);
   return data_plan_list;
 }
 
 }  // namespace chromeos