Implement networkingPrivate.getNetworks

chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 499d172264484a63c23a27477a84ab0f44c5b246..76a2434981fc3c89b646f7b0ef58eae43154cdf4 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -138,7 +138,8 @@ class ExtensionNetworkingPrivateApiTest
   ExtensionNetworkingPrivateApiTest()
 #if defined(OS_CHROMEOS)
       : detector_(NULL),
-        service_test_(NULL)
+        service_test_(NULL),
+        manager_test_(NULL)
 #endif
   {
   }
@@ -221,8 +222,9 @@ class ExtensionNetworkingPrivateApiTest
     InitializeSanitizedUsername();
 
     DBusThreadManager* dbus_manager = DBusThreadManager::Get();
-    ShillManagerClient::TestInterface* manager_test =
-        dbus_manager->GetShillManagerClient()->GetTestInterface();
+    manager_test_ = dbus_manager->GetShillManagerClient()->GetTestInterface();
+    service_test_ = dbus_manager->GetShillServiceClient()->GetTestInterface();
+
     ShillIPConfigClient::TestInterface* ip_config_test =
         dbus_manager->GetShillIPConfigClient()->GetTestInterface();
     ShillDeviceClient::TestInterface* device_test =
@@ -230,8 +232,6 @@ class ExtensionNetworkingPrivateApiTest
     ShillProfileClient::TestInterface* profile_test =
         dbus_manager->GetShillProfileClient()->GetTestInterface();
 
-    service_test_ = dbus_manager->GetShillServiceClient()->GetTestInterface();
-
     device_test->ClearDevices();
     service_test_->ClearServices();
 
@@ -323,7 +323,7 @@ class ExtensionNetworkingPrivateApiTest
 
     AddService("stub_vpn1", "vpn1", shill::kTypeVPN, shill::kStateOnline);
 
-    manager_test->SortManagerServices();
+    manager_test_->SortManagerServices();
 
     content::RunAllPendingInMessageLoop();
   }
@@ -358,6 +358,7 @@ class ExtensionNetworkingPrivateApiTest
 
   NetworkPortalDetectorTestImpl* detector_;
   ShillServiceClient::TestInterface* service_test_;
+  ShillManagerClient::TestInterface* manager_test_;
   policy::MockConfigurationPolicyProvider provider_;
   std::string userhash_;
 #endif
@@ -392,7 +393,16 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
 }
 
 #if defined(OS_CHROMEOS)
-// Non-Chrome OS only supports wifi currently.
+// TODO(stevenjb/mef): Fix these on non-Chrome OS, crbug.com/371442.
+IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetNetworks) {
+  // Remove "stub_wifi2" from the visible list.
+  manager_test_->RemoveManagerService("stub_wifi2", false);
+  // Add a couple of additional networks that are not configured (saved).
+  AddService("stub_wifi3", "wifi3", shill::kTypeWifi, shill::kStateIdle);
+  AddService("stub_wifi4", "wifi4", shill::kTypeWifi, shill::kStateIdle);
+  EXPECT_TRUE(RunNetworkingSubtest("getNetworks")) << message_;
+}
+
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) {
   EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_;
 }