Support javascript gtests in an extension background page.

chrome/test/base/web_ui_browser_test_browsertest.cc

Index: chrome/test/base/web_ui_browser_test_browsertest.cc
diff --git a/chrome/test/base/web_ui_browser_test_browsertest.cc b/chrome/test/base/web_ui_browser_test_browsertest.cc
index 5fe1392da303fd20e0c764bb306deb64c6ac9636..b0c18853c2a47647fa3c94883903fbcf13b86574 100644
--- a/chrome/test/base/web_ui_browser_test_browsertest.cc
+++ b/chrome/test/base/web_ui_browser_test_browsertest.cc
@@ -81,9 +81,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserExpectFailTest, TestFailsAsyncFast) {
 class WebUIBrowserAsyncTest : public WebUIBrowserTest {
  public:
   // Calls the testDone() function from test_api.js
-  void TestDone() {
-    RunJavascriptFunction("testDone");
-  }
+  void TestDone() { RunJavascriptFunction("testDone"); }

[Peter Lundblad, 2014/06/08 23:27:22]

Is this file *just* git cl format or is there any non-style change here?
If the former, can we dorp it from the cl to not disttact the rest?

[David Tseng, 2014/06/10 05:35:22]

reverted file.

 
   // Starts a failing test.
   void RunTestFailsAssert() {
@@ -109,16 +107,20 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
 
    private:
     virtual void RegisterMessages() OVERRIDE {
-      web_ui()->RegisterMessageCallback("startAsyncTest",
+      web_ui()->RegisterMessageCallback(
+          "startAsyncTest",
           base::Bind(&AsyncWebUIMessageHandler::HandleStartAsyncTest,
                      base::Unretained(this)));
-      web_ui()->RegisterMessageCallback("testContinues",
+      web_ui()->RegisterMessageCallback(
+          "testContinues",
           base::Bind(&AsyncWebUIMessageHandler::HandleTestContinues,
                      base::Unretained(this)));
-      web_ui()->RegisterMessageCallback("testFails",
+      web_ui()->RegisterMessageCallback(
+          "testFails",
           base::Bind(&AsyncWebUIMessageHandler::HandleTestFails,
                      base::Unretained(this)));
-      web_ui()->RegisterMessageCallback("testPasses",
+      web_ui()->RegisterMessageCallback(
+          "testPasses",
           base::Bind(&AsyncWebUIMessageHandler::HandleTestPasses,
                      base::Unretained(this)));
     }
@@ -185,11 +187,10 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestSyncPasses) {
 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncPasses) {
   ::testing::InSequence s;
   EXPECT_CALL(message_handler_, HandleTestContinues(::testing::_));
-  EXPECT_CALL(message_handler_, HandleTestPasses(::testing::_))
-      .WillOnce(::testing::InvokeWithoutArgs(
-          this, &WebUIBrowserAsyncTest::TestDone));
-  ASSERT_TRUE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testPasses")));
+  EXPECT_CALL(message_handler_, HandleTestPasses(::testing::_)).WillOnce(
+      ::testing::InvokeWithoutArgs(this, &WebUIBrowserAsyncTest::TestDone));
+  ASSERT_TRUE(RunJavascriptAsyncTest("startAsyncTest",
+                                     new base::StringValue("testPasses")));
 }
 
 // Test that two tests pass.
@@ -200,11 +201,10 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncPassPass) {
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::RunTestPasses));
   EXPECT_CALL(message_handler_, HandleTestContinues(::testing::_));
-  EXPECT_CALL(message_handler_, HandleTestPasses(::testing::_))
-      .WillOnce(::testing::InvokeWithoutArgs(
-          this, &WebUIBrowserAsyncTest::TestDone));
-  ASSERT_TRUE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testPasses")));
+  EXPECT_CALL(message_handler_, HandleTestPasses(::testing::_)).WillOnce(
+      ::testing::InvokeWithoutArgs(this, &WebUIBrowserAsyncTest::TestDone));
+  ASSERT_TRUE(RunJavascriptAsyncTest("startAsyncTest",
+                                     new base::StringValue("testPasses")));
 }
 
 // Test that first test passes; second fails.
@@ -215,8 +215,8 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncPassThenFail) {
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::RunTestFailsAssert));
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
-  ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testPasses")));
+  ASSERT_FALSE(RunJavascriptAsyncTest("startAsyncTest",
+                                      new base::StringValue("testPasses")));
 }
 
 // Test that testDone() with failure first then sync pass still fails.