Reimplement ActivateCellularModem without Libcros

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"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/gvalue_util.h"
@@ skipping 221 matching lines @@
 bool g_libcros_network_functions_enabled = true;
 
 }  // namespace
 
 void SetLibcrosNetworkFunctionsEnabled(bool enabled) {
   g_libcros_network_functions_enabled = enabled;
 }
 
 bool CrosActivateCellularModem(const std::string& service_path,
                                const std::string& carrier) {
-  return chromeos::ActivateCellularModem(service_path.c_str(), carrier.c_str());
+  if (g_libcros_network_functions_enabled) {
+    return chromeos::ActivateCellularModem(service_path.c_str(),
+                                           carrier.c_str());
+  } else {
+    return DBusThreadManager::Get()->GetFlimflamServiceClient()->
+        CallActivateCellularModemAndBlock(dbus::ObjectPath(service_path),
+                                          carrier);
+  }
 }
 
 void CrosSetNetworkServiceProperty(const std::string& service_path,
                                    const std::string& property,
                                    const base::Value& value) {
   if (g_libcros_network_functions_enabled) {
     ScopedGValue gvalue(ConvertValueToGValue(value));
     chromeos::SetNetworkServicePropertyGValue(service_path.c_str(),
                                               property.c_str(),
                                               gvalue.get());
@@ skipping 412 matching lines @@
     ScopedGHashTable ghash(
         ConvertDictionaryValueToStringValueGHashTable(properties));
     chromeos::ConfigureService("", ghash.get(), OnConfigureService, NULL);
   } else {
     DBusThreadManager::Get()->GetFlimflamManagerClient()->ConfigureService(
         properties, base::Bind(&DoNothing));
   }
 }
 
 }  // namespace chromeos