Add support for Device.ProposeScan to NetworkDeviceHandler.

chromeos/network/network_device_handler.cc

 // Copyright 2013 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/network/network_device_handler.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
@@ skipping 81 matching lines @@
         base::Bind(&IPConfigRefreshCallback, ipconfig_path));
   }
   // It is safe to invoke |callback| here instead of waiting for the
   // IPConfig.Refresh callbacks to complete because the Refresh DBus calls will
   // be executed in order and thus before any further DBus requests that
   // |callback| may issue.
   if (!callback.is_null())
     callback.Run();
 }
 
+void ProposeScanCallback(
+    const std::string& device_path,
+    const base::Closure& callback,
+    const network_handler::ErrorCallback& error_callback,
+    DBusMethodCallStatus call_status) {
+  if (call_status != DBUS_METHOD_CALL_SUCCESS) {
+    NET_LOG_ERROR(
+        base::StringPrintf("Device.ProposeScan failed: %d", call_status),
+        device_path);
+    network_handler::ShillErrorCallbackFunction(
+        "Device.ProposeScan Failed",
+        device_path,
+        error_callback,
+        base::StringPrintf("DBus call failed: %d", call_status), "");
+    return;
+  }
+  NET_LOG_EVENT("Device.ProposeScan succeeded.", device_path);
+  if (!callback.is_null())
+    callback.Run();
+}
+
 }  // namespace
 
 const char NetworkDeviceHandler::kErrorFailure[] = "failure";
 const char NetworkDeviceHandler::kErrorIncorrectPin[] = "incorrect-pin";
 const char NetworkDeviceHandler::kErrorNotSupported[] = "not-supported";
 const char NetworkDeviceHandler::kErrorPinBlocked[] = "pin-blocked";
 const char NetworkDeviceHandler::kErrorPinRequired[] = "pin-required";
 const char NetworkDeviceHandler::kErrorUnknown[] = "unknown";
 
 NetworkDeviceHandler::NetworkDeviceHandler() {
@@ skipping 15 matching lines @@
 void NetworkDeviceHandler::RequestRefreshIPConfigs(
     const std::string& device_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   GetDeviceProperties(device_path,
                       base::Bind(&RefreshIPConfigsCallback,
                                  callback, error_callback),
                       error_callback);
 }
 
+void NetworkDeviceHandler::ProposeScan(
+    const std::string& device_path,
+    const base::Closure& callback,
+    const network_handler::ErrorCallback& error_callback) {
+  DBusThreadManager::Get()->GetShillDeviceClient()->ProposeScan(
+      dbus::ObjectPath(device_path),
+      base::Bind(&ProposeScanCallback, device_path, callback, error_callback));
+}
+
 void NetworkDeviceHandler::SetCarrier(
     const std::string& device_path,
     const std::string& carrier,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   DBusThreadManager::Get()->GetShillDeviceClient()->SetCarrier(
       dbus::ObjectPath(device_path),
       carrier,
       callback,
       base::Bind(&HandleShillCallFailure, device_path, error_callback));
@@ skipping 56 matching lines @@
 void NetworkDeviceHandler::HandleShillCallFailureForTest(
     const std::string& device_path,
     const network_handler::ErrorCallback& error_callback,
     const std::string& shill_error_name,
     const std::string& shill_error_message) {
   HandleShillCallFailure(
       device_path, error_callback, shill_error_name, shill_error_message);
 }
 
 }  // namespace chromeos