Reimplement ActivateCellularModem without Libcros

chrome/browser/chromeos/cros/cros_network_functions.cc

Index: chrome/browser/chromeos/cros/cros_network_functions.cc
diff --git a/chrome/browser/chromeos/cros/cros_network_functions.cc b/chrome/browser/chromeos/cros/cros_network_functions.cc
index 1a43a3e3bcf80cb148a64a8760ca282250f2dd52..3664e4fc9f68a64ae71a44fa5aa664bfb8b47b00 100644
--- a/chrome/browser/chromeos/cros/cros_network_functions.cc
+++ b/chrome/browser/chromeos/cros/cros_network_functions.cc
@@ -239,7 +239,14 @@ void SetLibcrosNetworkFunctionsEnabled(bool 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,