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..514afd4e1b4f18a88f91fd90a9dc1f4f48cd2f60 100644
--- a/chrome/browser/chromeos/extensions/networking_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/networking_private_apitest.cc
@@ -19,10 +19,33 @@ 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.
+    std::string js_named_subtest = subtest;
+    js_named_subtest[0] = ::tolower(subtest[0]);
+    EXPECT_TRUE(RunExtensionSubtest(
+        "networking", "main.html#" + js_named_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, and then they won't affect each
+// other.
+#define DO_NETWORKING_SUBTEST(name)                                   \
+  IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, name) {   \
+    RunNetworkingSubtest(#name);                                      \
+  }

[stevenjb, 2013/02/12 17:19:16]

I'm not a big fan of macros, and thought the style guide prohibits it? I'd
rather see these expanded out.

[Greg Spencer (Chromium), 2013/02/12 17:34:56]

It does not prohibit it, it merely warns about the pitfalls, and I'm following
all of the suggested guidelines here. I mainly wanted it for the stringification
of the name so that I can easily build meaningful names for the tests, add new
ones easily and avoid cut-paste errors when adding new ones.

+
+DO_NETWORKING_SUBTEST(StartConnect);
+DO_NETWORKING_SUBTEST(StartDisconnect);
+DO_NETWORKING_SUBTEST(StartConnectNonexistent);
+DO_NETWORKING_SUBTEST(GetVisibleNetworks);
+DO_NETWORKING_SUBTEST(GetVisibleNetworksWifi);
+DO_NETWORKING_SUBTEST(GetProperties);
+DO_NETWORKING_SUBTEST(OnNetworksChangedEvent);
+DO_NETWORKING_SUBTEST(OnNetworkListChangedEvent);
 
 }  // namespace chromeos