Next phase for chrome.networkingPrivate interface.

chrome/browser/chromeos/extensions/networking_private_apitest.cc

Index: chrome/browser/chromeos/extensions/networking_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/networking_private_apitest.cc b/chrome/browser/chromeos/extensions/networking_private_apitest.cc
index 25dcd400f62b9911c0b2b7ccf63f4530ebebe62e..2e0741b97328509f452256b51b555012a89f7352 100644
--- a/chrome/browser/chromeos/extensions/networking_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/networking_private_apitest.cc
@@ -19,10 +19,53 @@ class ExtensionNetworkingPrivateApiTest : public ExtensionApiTest {
     command_line->AppendSwitchASCII(
         switches::kWhitelistedExtensionID, "epcifkihnkjgphfkloaaleeakhpmgdmn");
  }
+
+  void RunNetworkingSubtest(const std::string& subtest) {
+    // Make the first character lowercase so we can match naming conventions.
+    EXPECT_TRUE(RunExtensionSubtest(
+        "networking", "main.html?" + subtest,
+        kFlagEnableFileAccess | kFlagLoadAsComponent)) << message_;
+  }
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, BasicFunctions) {
-  ASSERT_TRUE(RunComponentExtensionTest("networking")) << message_;
+// Place each subtest into a separate browser test so that the stub networking
+// library state is reset for each subtest run. This way they won't affect each
+// other.
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartConnect) {
+  RunNetworkingSubtest("startConnect");

[not at google - send to devlin, 2013/02/12 23:36:09]

The way you have it failures won't be on the line that they happen, they'll
always be on line 25. I guess here it doesn't matter so much since each test is
only 1 line so you'll be able to tell... but
EXPECT_TRUE(RunNetworkingSubtest(..)) would generally be better (particularly if
any of these tests get more complicated).

[Greg Spencer (Chromium), 2013/02/12 23:57:42]

Good point.  Fixed.

+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartDisconnect) {
+  RunNetworkingSubtest("startDisconnect");
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,
+                       StartConnectNonexistent) {
+  RunNetworkingSubtest("startConnectNonexistent");
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) {
+  RunNetworkingSubtest("getVisibleNetworks");
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,
+                       GetVisibleNetworksWifi) {
+  RunNetworkingSubtest("getVisibleNetworksWifi");
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, GetProperties) {
+  RunNetworkingSubtest("getProperties");
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,
+                       OnNetworksChangedEvent) {
+  RunNetworkingSubtest("onNetworksChangedEvent");
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,
+                       OnNetworkListChangedEvent) {
+  RunNetworkingSubtest("onNetworkListChangedEvent");
 }
 
 }  // namespace chromeos