PyAuto automation hooks: blocking wifi connect, disconnect, and network scan.

chrome/browser/automation/testing_automation_provider_chromeos.cc

 // Copyright (c) 2011 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/automation/testing_automation_provider.h"
 
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 178 matching lines @@
       item->SetString("roaming_state",
                       cellular_networks[i]->GetRoamingStateString());
       items->Append(item);
     }
     return_value->Set("cellular_networks", items);
   }
 
   reply.SendSuccess(return_value.get());
 }
 
+void TestingAutomationProvider::NetworkScan(DictionaryValue* args,
+                                            IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+
+  if (!CrosLibrary::Get()->EnsureLoaded()) {
+    reply.SendError("Could not load cros library.");
+    return;
+  }
+
+  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();

[dennis_jeffrey, 2011/03/24 23:48:54]

Are we guaranteed that this variable will be non-NULL before we dereference it
below?

[dtu, 2011/03/25 22:22:11]

Yes, see stevenjb's comment.

+  network_library->RequestNetworkScan();
+
+  // Set up an observer (it will delete itself).
+  new NetworkScanObserver(this, reply_message);
+}
+
 void TestingAutomationProvider::ConnectToWifiNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   std::string service_path, password, identity, certpath;
   if (!args->GetString("service_path", &service_path) ||
       !args->GetString("password", &password) ||
       !args->GetString("identity", &identity) ||
       !args->GetString("certpath", &certpath)) {
     reply.SendError("Invalid or missing args");
     return;
   }
 
   if (!CrosLibrary::Get()->EnsureLoaded()) {
     reply.SendError("Could not load cros library.");
     return;
   }
 
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   chromeos::WifiNetwork* wifi =
       network_library->FindWifiNetworkByPath(service_path);
   if (!wifi) {
-    reply.SendError("Failed to connect");
+    reply.SendError("No network found with specified service path.");
     return;
   }
   if (!password.empty())
     wifi->SetPassphrase(password);
   if (!identity.empty())
     wifi->SetIdentity(identity);
   if (!certpath.empty())
     wifi->SetCertPath(certpath);
+
+  // Set up an observer (it will delete itself).
+  new NetworkConnectObserver(this, reply_message, wifi);

[stevenjb, 2011/03/25 01:12:22]

See my notes in NetworkConnectObserver, but we are probably better off passing
service_path to the constructor instead of wifi.

[dtu, 2011/03/25 22:22:11]

Done.

+
   network_library->ConnectToWifiNetwork(service_path);

[stevenjb, 2011/03/25 01:12:22]

It is now valid and slightly more optimal to pass wifi here instead of
service_path (saves an extra lookup).

[dtu, 2011/03/25 22:22:11]

Done.

+  network_library->RequestNetworkScan();
+}
 
-  // TODO(stevenjb): Observe the network library and check for a successful
-  // connection.
+void TestingAutomationProvider::DisconnectFromWifiNetwork(
+    DictionaryValue* args, IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  std::string service_path;
+  if (!args->GetString("service_path", &service_path)) {
+    reply.SendError("Invalid or missing args");

[dennis_jeffrey, 2011/03/24 23:48:54]

Put period at end of the string sentence (to be consistent with other error
strings in this file).

[dtu, 2011/03/25 22:22:11]

Done.

+    return;
+  }
 
+  if (!CrosLibrary::Get()->EnsureLoaded()) {
+    reply.SendError("Could not load cros library.");
+    return;
+  }
+
+  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();

[dennis_jeffrey, 2011/03/24 23:48:54]

Same comment as line 208 above.

[dtu, 2011/03/25 22:22:11]

Same reply as line 208 above.

+  chromeos::WifiNetwork* wifi =
+      network_library->FindWifiNetworkByPath(service_path);
+  if (!wifi) {
+    reply.SendError("No network found with specified service path.");
+    return;
+  }
+
+  network_library->DisconnectFromWirelessNetwork(wifi);
   reply.SendSuccess(NULL);
 }