Allow overriding WebUIFactory when test flag is set.

chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc

Index: chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc
diff --git a/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc b/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a1ba2210a1632e0482b3e42a9e50dc58fbeff2a8
--- /dev/null
+++ b/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc
@@ -0,0 +1,61 @@
+// Copyright (c) 2011 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 "chrome/browser/ui/webui/test_chrome_web_ui_factory.h"
+
+#include "chrome/test/in_process_browser_test.h"
+#include "chrome/test/ui_test_utils.h"
+#include "googleurl/src/gurl.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using ::testing::_;
+using ::testing::Eq;
+using ::testing::StrictMock;
+
+namespace {
+
+// Returns a new |WebUI| object for the TabContents from |arg0|.
+ACTION(ReturnNewWebUI) {
+  return new WebUI(arg0);
+}
+
+// Mock the TestChromeWebUIFactory::WebUIProvider to prove that we are called as
+// expected.
+class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider {
+ public:
+  MOCK_METHOD2(NewWebUI, WebUI*(TabContents* tab_contents, const GURL& url));
+};
+
+// Dummy URL location for us to override.
+const char kChromeTestChromeWebUIFactory[] =
+    "chrome://ChromeTestChromeWebUIFactory/";
+
+// Sets up and tears down the factory override for our url's host.
+class TestChromeWebUIFactoryTest : public InProcessBrowserTest {
+ public:
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+    TestChromeWebUIFactory::AddFactoryOverride(
+        GURL(kChromeTestChromeWebUIFactory).host(), &mock_provider_);
+  }
+
+  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+    TestChromeWebUIFactory::RemoveFactoryOverride(
+        GURL(kChromeTestChromeWebUIFactory).host());

[Evan Stade, 2011/05/24 17:25:59]

is there a reason to do this setup and teardown here rather than in the test
itself (if you don't plan to write any more tests for TestChromeWebUIFactory)

[Sheridan Rawlins, 2011/05/24 20:17:22]

In fact, putting this here uncovered a bug.  I wanted to make sure that I was
only called once, and when I had GURL as a global constant, it was constructed
before the url_parsing system was initialized and was registering a host of "". 
If I move this into the test, then I don't believe the initial browse to
about:blank goes through the test factory.

On 2011/05/24 17:25:59, Evan Stade wrote:

[Evan Stade, 2011/05/25 18:49:04]

no, I meant why is everything within SetUp and TearDown not just inside the test
itself?

re: GURL as global constant: that's why non-PODs should never be global.

[Sheridan Rawlins, 2011/05/25 21:02:55]

If I move the add/remove to the method, then I'm not registered early enough to
catch cases where I'm called unexpectedly.

To prove this empirically, I added AddFactoryOverride("", &mock_provider_) both
here and in the test, and only caught the spurious call to the mock when the
code was in the SetUpInProcessBrowserTestFixture().

On 2011/05/25 18:49:04, Evan Stade wrote:

+  }
+
+ protected:
+  StrictMock<MockWebUIProvider> mock_provider_;
+};
+
+// Test that browsing to our test url causes us to be called once.
+IN_PROC_BROWSER_TEST_F(TestChromeWebUIFactoryTest, TestWebUIProvider) {
+  const GURL kChromeTestChromeWebUIFactoryURL(kChromeTestChromeWebUIFactory);
+  EXPECT_CALL(mock_provider_, NewWebUI(_, Eq(kChromeTestChromeWebUIFactoryURL)))
+      .WillOnce(ReturnNewWebUI());

[Evan Stade, 2011/05/24 17:25:59]

. goes on EOL

[Sheridan Rawlins, 2011/05/24 20:17:22]

I'd prefer to keep in the style of gmock examples, which start each expecataion
line with a dot (http://code.google.com/p/googlemock/wiki/CheatSheet)

On 2011/05/24 17:25:59, Evan Stade wrote:

+  ui_test_utils::NavigateToURL(browser(), kChromeTestChromeWebUIFactoryURL);
+}
+
+}  //namespace

[Evan Stade, 2011/05/24 17:25:59]

space after //

[Lei Zhang (Do not use), 2011/05/24 18:00:06]

No need to put the actual tests inside an anonymous namespace.

[Sheridan Rawlins, 2011/05/24 20:17:22]

Done.

[Sheridan Rawlins, 2011/05/24 20:17:22]

Done.