WebUI Testing: async support - global mocking, deferred runs, continued run.

chrome/browser/ui/webui/web_ui_browsertest.cc

Index: chrome/browser/ui/webui/web_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index 332b59f69ab4a434417d663cb4d8c7fd4fb4209a..c95d60154ee0caa09f190dec9280bcf2179ba2d1 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -79,12 +79,17 @@ bool WebUIBrowserTest::RunJavascriptFunction(
       function_name, function_arguments, false, false, NULL);
 }
 
-bool WebUIBrowserTest::RunJavascriptTestF(const std::string& test_fixture,
+bool WebUIBrowserTest::RunJavascriptTestF(bool is_async,
+                                          const std::string& test_fixture,
                                           const std::string& test_name) {
   ConstValueVector args;
   args.push_back(Value::CreateStringValue(test_fixture));
   args.push_back(Value::CreateStringValue(test_name));
-  return RunJavascriptTest("RUN_TEST_F", args);
+
+  if (is_async)
+    return RunJavascriptAsyncTest("RUN_TEST_F", args);
+  else
+    return RunJavascriptTest("RUN_TEST_F", args);
 }
 
 bool WebUIBrowserTest::RunJavascriptTest(const std::string& test_name) {
@@ -185,11 +190,34 @@ void WebUIBrowserTest::BrowsePrintPreload(
   tabstrip_observer.WaitForObservation();
 }
 
+const char WebUIBrowserTest::kDummyURL[] = "chrome://DummyURL";
+
 WebUIBrowserTest::WebUIBrowserTest()
     : test_handler_(new WebUITestHandler()),
       libraries_preloaded_(false) {}
 
+namespace {
+
+class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider {
+ public:
+  MockWebUIProvider() {}
+
+  // Returns a new ChromeWebUI
+  WebUI* NewWebUI(TabContents* tab_contents, const GURL& url) OVERRIDE {
+    return new ChromeWebUI(tab_contents);
+  }
+};
+
+base::LazyInstance<MockWebUIProvider> mock_provider_(
+    base::LINKER_INITIALIZED);
+
+}  // namespace
+
 void WebUIBrowserTest::SetUpInProcessBrowserTestFixture() {
+  InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+  TestChromeWebUIFactory::AddFactoryOverride(GURL(kDummyURL).host(),
+                                             mock_provider_.Pointer());
+
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_));
   test_data_directory_ = test_data_directory_.Append(kWebUITestFolder);
 
@@ -208,6 +236,11 @@ void WebUIBrowserTest::SetUpInProcessBrowserTestFixture() {
   AddLibrary(FilePath(kWebUILibraryJS));
 }
 
+void WebUIBrowserTest::TearDownInProcessBrowserTestFixture() {
+  InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
+  TestChromeWebUIFactory::RemoveFactoryOverride(GURL(kDummyURL).host());
+}
+
 WebUIMessageHandler* WebUIBrowserTest::GetMockMessageHandler() {
   return NULL;
 }
@@ -401,8 +434,6 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
  protected:
   WebUIBrowserAsyncTest() {}
 
-  static const char kDummyURL[];
-
   // Class to synchronize asynchronous javascript activity with the tests.
   class AsyncWebUIMessageHandler : public WebUIMessageHandler {
    public:
@@ -438,35 +469,11 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
   ::testing::StrictMock<AsyncWebUIMessageHandler> message_handler_;
 
  private:
-  // Class to provide a ChromeWebUI for |kDummyURL|.
-  class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider {
-   public:
-    MockWebUIProvider() {}
-
-    // Returns a new ChromeWebUI
-    WebUI* NewWebUI(TabContents* tab_contents, const GURL& url) OVERRIDE {
-      return new ChromeWebUI(tab_contents);
-    }
-  };
-
   // Provide this object's handler.
   virtual WebUIMessageHandler* GetMockMessageHandler() OVERRIDE {
     return &message_handler_;
   }
 
-  // Set up the kDummyURL to be a WebUI page.
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    WebUIBrowserTest::SetUpInProcessBrowserTestFixture();
-    TestChromeWebUIFactory::AddFactoryOverride(GURL(kDummyURL).host(),
-                                               &mock_provider_);
-  }
-
-  // Tear down the kDummyURL WebUI page.
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
-    WebUIBrowserTest::TearDownInProcessBrowserTestFixture();
-    TestChromeWebUIFactory::RemoveFactoryOverride(GURL(kDummyURL).host());
-  }
-
   // Set up and browse to kDummyURL for all tests.
   virtual void SetUpOnMainThread() OVERRIDE {
     WebUIBrowserTest::SetUpOnMainThread();
@@ -474,14 +481,9 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
     ui_test_utils::NavigateToURL(browser(), GURL(kDummyURL));
   }
 
-  // Provider for this object.
-  MockWebUIProvider mock_provider_;
-
   DISALLOW_COPY_AND_ASSIGN(WebUIBrowserAsyncTest);
 };
 
-const char WebUIBrowserAsyncTest::kDummyURL[] = "chrome://Dummy";
-
 // Test that assertions fail immediately after assertion fails (no testContinues
 // message). (Sync version).
 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestSyncOkTestFail) {