<webview>: Reduce test flake.

chrome/browser/apps/web_view_interactive_browsertest.cc

 // Copyright 2013 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 "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 124 matching lines @@
     if (first_click_) {
       mouse_click_result_ = ui_test_utils::SendMouseEventsSync(button,
                                                                 state);
       first_click_ = false;
     } else {
       ASSERT_EQ(mouse_click_result_, ui_test_utils::SendMouseEventsSync(
           button, state));
     }
   }
 
+  enum TestServer {
+    NEEDS_TEST_SERVER,
+    NO_TEST_SERVER
+  };
+
   scoped_ptr<ExtensionTestMessageListener> RunAppHelper(
       const std::string& test_name,
       const std::string& app_location,
+      TestServer test_server,
       content::WebContents** embedder_web_contents) {
     // For serving guest pages.
-    if (!StartEmbeddedTestServer()) {
+    if ((test_server == NEEDS_TEST_SERVER) && !StartEmbeddedTestServer()) {
       LOG(ERROR) << "FAILED TO START TEST SERVER.";
       return scoped_ptr<ExtensionTestMessageListener>();
     }
 
     ExtensionTestMessageListener launched_listener("Launched", false);
     LoadAndLaunchPlatformApp(app_location.c_str());
     if (!launched_listener.WaitUntilSatisfied()) {
       LOG(ERROR) << "TEST DID NOT LAUNCH.";
       return scoped_ptr<ExtensionTestMessageListener>();
     }
@@ skipping 15 matching lines @@
             *embedder_web_contents,
             base::StringPrintf("runTest('%s')", test_name.c_str()))) {
       LOG(ERROR) << "UNABLE TO START TEST";
       return scoped_ptr<ExtensionTestMessageListener>();
     }
 
     return done_listener.Pass();
   }
 
   void TestHelper(const std::string& test_name,
-                  const std::string& app_location) {
+                  const std::string& app_location,
+                  TestServer test_server) {
     content::WebContents* embedder_web_contents = NULL;
     scoped_ptr<ExtensionTestMessageListener> done_listener(
-        RunAppHelper(test_name, app_location, &embedder_web_contents));
+        RunAppHelper(
+            test_name, app_location, test_server, &embedder_web_contents));
 
     ASSERT_TRUE(done_listener);
     ASSERT_TRUE(done_listener->WaitUntilSatisfied());
   }
 
+  void RunTest(const std::string& app_name) {
+  }
   void SetupTest(const std::string& app_name,
                  const std::string& guest_url_spec) {
     ASSERT_TRUE(StartEmbeddedTestServer());
     GURL::Replacements replace_host;
     std::string host_str("localhost");  // Must stay in scope with replace_host.
     replace_host.SetHostStr(host_str);
 
     GURL guest_url = embedded_test_server()->GetURL(guest_url_spec);
     guest_url = guest_url.ReplaceComponents(replace_host);
 
@@ skipping 290 matching lines @@
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
         gfx::Point(corner().x() + 51, corner().y() + 11)));
     ASSERT_TRUE(move_listener2.WaitUntilSatisfied());
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX))
 
 // Tests that setting focus on the <webview> sets focus on the guest.
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Focus_FocusEvent) {
-  TestHelper("testFocusEvent", "web_view/focus");
+  TestHelper("testFocusEvent", "web_view/focus", NO_TEST_SERVER);
 }
 
 // Tests that setting focus on the <webview> sets focus on the guest.
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Focus_BlurEvent) {
-  TestHelper("testBlurEvent", "web_view/focus");
+  TestHelper("testBlurEvent", "web_view/focus", NO_TEST_SERVER);
 }
 
 // Tests that guests receive edit commands and respond appropriately.
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommands) {
-  SetupTest("web_view/edit_commands",
-            "/extensions/platform_apps/web_view/edit_commands/guest.html");
+  ExtensionTestMessageListener guest_connected_listener("connected", false);
+  LoadAndLaunchPlatformApp("web_view/edit_commands");
+  // Wait until the guest process reports that it has established a message
+  // channel with the app.
+  ASSERT_TRUE(guest_connected_listener.WaitUntilSatisfied());
 
   ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
       GetPlatformAppWindow()));
 
   // Flush any pending events to make sure we start with a clean slate.
   content::RunAllPendingInMessageLoop();
 
   ExtensionTestMessageListener copy_listener("copy", false);
   SendCopyKeyPressToPlatformApp();
 
@@ skipping 14 matching lines @@
   content::RunAllPendingInMessageLoop();
 
   ExtensionTestMessageListener start_of_line_listener("StartOfLine", false);
   SendStartOfLineKeyPressToPlatformApp();
   // Wait for the guest to receive a 'copy' edit command.
   ASSERT_TRUE(start_of_line_listener.WaitUntilSatisfied());
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
                        NewWindow_NewWindowNameTakesPrecedence) {
-  TestHelper("testNewWindowNameTakesPrecedence", "web_view/newwindow");
+  TestHelper("testNewWindowNameTakesPrecedence",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
                        NewWindow_WebViewNameTakesPrecedence) {
-  TestHelper("testWebViewNameTakesPrecedence", "web_view/newwindow");
+  TestHelper("testWebViewNameTakesPrecedence",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_NoName) {
-  TestHelper("testNoName", "web_view/newwindow");
+  TestHelper("testNoName",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_Redirect) {
-  TestHelper("testNewWindowRedirect", "web_view/newwindow");
+  TestHelper("testNewWindowRedirect",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_Close) {
-  TestHelper("testNewWindowClose", "web_view/newwindow");
+  TestHelper("testNewWindowClose",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_ExecuteScript) {
-  TestHelper("testNewWindowExecuteScript", "web_view/newwindow");
+  TestHelper("testNewWindowExecuteScript",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_WebRequest) {
-  TestHelper("testNewWindowWebRequest", "web_view/newwindow");
+  TestHelper("testNewWindowWebRequest",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 // A custom elements bug needs to be addressed to enable this test:
 // See http://crbug.com/282477 for more information.
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
                        DISABLED_NewWindow_WebRequestCloseWindow) {
-  TestHelper("testNewWindowWebRequestCloseWindow", "web_view/newwindow");
+  TestHelper("testNewWindowWebRequestCloseWindow",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
                        NewWindow_WebRequestRemoveElement) {
-  TestHelper("testNewWindowWebRequestRemoveElement", "web_view/newwindow");
+  TestHelper("testNewWindowWebRequestRemoveElement",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
 }
 
 // Tests that Ctrl+Click/Cmd+Click on a link fires up the newwindow API.
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_OpenInNewTab) {
   content::WebContents* embedder_web_contents = NULL;
 
   ExtensionTestMessageListener loaded_listener("Loaded", false);
   scoped_ptr<ExtensionTestMessageListener> done_listener(
     RunAppHelper("testNewWindowOpenInNewTab",
                  "web_view/newwindow",
+                 NEEDS_TEST_SERVER,
                  &embedder_web_contents));
 
   loaded_listener.WaitUntilSatisfied();
 #if defined(OS_MACOSX)
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_RETURN,
       false, false, false, true /* cmd */));
 #else
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_RETURN,
@@ skipping 57 matching lines @@
   quit_closure_ = run_loop.QuitClosure();
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&WebViewInteractiveTest::DragTestStep1,
                  base::Unretained(this)));
   run_loop.Run();
 }
 #endif  // (defined(OS_CHROMEOS))
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Navigation) {
-  TestHelper("testNavigation", "web_view/navigation");
+  TestHelper("testNavigation", "web_view/navigation", NO_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Navigation_BackForwardKeys) {
-  ASSERT_TRUE(StartEmbeddedTestServer());  // For serving guest pages.
   ExtensionTestMessageListener launched_listener("Launched", false);
   LoadAndLaunchPlatformApp("web_view/navigation");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
   ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
       GetPlatformAppWindow()));
   // Flush any pending events to make sure we start with a clean slate.
   content::RunAllPendingInMessageLoop();
 
   content::WebContents* embedder_web_contents =
@@ skipping 14 matching lines @@
 
   ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied());
   SendBackShortcutToPlatformApp();
 
   ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied());
   SendForwardShortcutToPlatformApp();
 
   ASSERT_TRUE(done_listener.WaitUntilSatisfied());
 }
 
-// Fail at least once a day on Windows. See http://crbug.com/293445.
-#if defined(OS_WIN)
-#define MAYBE_PointerLock_PointerLockLostWithFocus \
-    DISABLED_PointerLock_PointerLockLostWithFocus
-#else
-#define MAYBE_PointerLock_PointerLockLostWithFocus \
-    PointerLock_PointerLockLostWithFocus
-#endif
-
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
-                       MAYBE_PointerLock_PointerLockLostWithFocus) {
-  TestHelper("testPointerLockLostWithFocus", "web_view/pointerlock");
+                       PointerLock_PointerLockLostWithFocus) {
+  TestHelper("testPointerLockLostWithFocus",
+             "web_view/pointerlock",
+             NO_TEST_SERVER);
 }