Reimplement ActivateCellularModem without Libcros

chromeos/dbus/flimflam_service_client.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 "chromeos/dbus/flimflam_service_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 88 matching lines @@
   virtual void ActivateCellularModem(const dbus::ObjectPath& service_path,
                                      const std::string& carrier,
                                      const VoidCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kActivateCellularModemFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(carrier);
     GetHelper(service_path)->CallVoidMethod(&method_call, callback);
   }
 
+  // FlimflamServiceClient override.
+  virtual bool CallActivateCellularModemAndBlock(
+      const dbus::ObjectPath& service_path,
+      const std::string& carrier) OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
+                                 flimflam::kActivateCellularModemFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(carrier);
+    return GetHelper(service_path)->CallVoidMethodAndBlock(&method_call);
+  }
+
  private:
   typedef std::map<std::string, FlimflamClientHelper*> HelperMap;
 
   // Returns the corresponding FlimflamClientHelper for the profile.
   FlimflamClientHelper* GetHelper(const dbus::ObjectPath& service_path) {
     HelperMap::iterator it = helpers_.find(service_path.value());
     if (it != helpers_.end())
       return it->second;
 
     // There is no helper for the profile, create it.
@@ skipping 71 matching lines @@
     PostSuccessVoidCallback(callback);
   }
 
   // FlimflamServiceClient override.
   virtual void ActivateCellularModem(const dbus::ObjectPath& service_path,
                                      const std::string& carrier,
                                      const VoidCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
+  // FlimflamServiceClient override.
+  virtual bool CallActivateCellularModemAndBlock(
+      const dbus::ObjectPath& service_path,
+      const std::string& carrier) OVERRIDE {
+    return true;
+  }
+
  private:
   void PassEmptyDictionaryValue(const DictionaryValueCallback& callback) const {
     base::DictionaryValue dictionary;
     callback.Run(DBUS_METHOD_CALL_SUCCESS, dictionary);
   }
 
   // Posts a task to run a void callback with success status code.
   void PostSuccessVoidCallback(const VoidCallback& callback) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
@@ skipping 15 matching lines @@
 FlimflamServiceClient* FlimflamServiceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new FlimflamServiceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FlimflamServiceClientStubImpl();
 }
 
 }  // namespace chromeos