[Extensions] Try re-enabling an externally-connectable test on windows

The entire suite of externally-connectable messaging tests has been
disabled on Windows. I'm unable to reproduce any failures locally, and
all the logs have dried up. Try re-enabling one, and see how it goes.

Bug: 350517

Change-Id: Ib08941ad1b5c6fd007056d2c9af8a8c349c08e05
Reviewed-on: https://chromium-review.googlesource.com/823012
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523561}

chrome/browser/extensions/extension_messages_apitest.cc

@@ -217,10 +217,6 @@ IN_PROC_BROWSER_TEST_P(MessagingApiTest, MessagingInterstitial) {
                                   kFlagLoadAsComponent)) << message_;
 }
 
-// XXX(kalman): All web messaging tests disabled on windows due to extreme
-// flakiness. See http://crbug.com/350517.
-#if !defined(OS_WIN)
-
 // Tests externally_connectable between a web page and an extension.
 //
 // TODO(kalman): Test between extensions. This is already tested in this file,
@@ -561,6 +557,10 @@ IN_PROC_BROWSER_TEST_P(ExternallyConnectableMessagingTest, NotInstalled) {
   EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame());
 }
 
+// TODO(kalman): Most web messaging tests disabled on windows due to extreme
+// flakiness. See http://crbug.com/350517.
+#if !defined(OS_WIN)
+
 // Tests two extensions on the same sites: one web connectable, one not.
 IN_PROC_BROWSER_TEST_P(ExternallyConnectableMessagingTest,
                        WebConnectableAndNotConnectable) {
@@ -1305,21 +1305,21 @@ IN_PROC_BROWSER_TEST_P(ExternallyConnectableMessagingTest,
 }
 
 INSTANTIATE_TEST_CASE_P(NativeBindings,
-                        ExternallyConnectableMessagingTest,
+                        ExternallyConnectableMessagingWithTlsChannelIdTest,
                         ::testing::Values(NATIVE_BINDINGS));
 INSTANTIATE_TEST_CASE_P(JavaScriptBindings,
-                        ExternallyConnectableMessagingTest,
+                        ExternallyConnectableMessagingWithTlsChannelIdTest,
                         ::testing::Values(JAVASCRIPT_BINDINGS));
 
+#endif  // !defined(OS_WIN) - http://crbug.com/350517.
+
 INSTANTIATE_TEST_CASE_P(NativeBindings,
-                        ExternallyConnectableMessagingWithTlsChannelIdTest,
+                        ExternallyConnectableMessagingTest,
                         ::testing::Values(NATIVE_BINDINGS));
 INSTANTIATE_TEST_CASE_P(JavaScriptBindings,
-                        ExternallyConnectableMessagingWithTlsChannelIdTest,
+                        ExternallyConnectableMessagingTest,
                         ::testing::Values(JAVASCRIPT_BINDINGS));
 
-#endif  // !defined(OS_WIN) - http://crbug.com/350517.
-
 // Tests that messages sent in the unload handler of a window arrive.
 IN_PROC_BROWSER_TEST_P(MessagingApiTest, MessagingOnUnload) {
   const Extension* extension =