Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10679)

Unified Diff: chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc

Issue 12089051: Revert 179271 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/test_chrome_web_ui_controller_factory.cc ('k') | chrome/test/base/web_ui_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
===================================================================
--- chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc (revision 179344)
+++ chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc (working copy)
@@ -1,81 +0,0 @@
-// Copyright (c) 2012 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/test/base/test_chrome_web_ui_controller_factory.h"
-#include "content/public/browser/web_ui_controller.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "googleurl/src/gurl.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using content::WebContents;
-using content::WebUI;
-using content::WebUIController;
-using ::testing::_;
-using ::testing::Eq;
-using ::testing::StrictMock;
-
-namespace {
-
-// Returns a new WebUI object for the WebContents from |arg0|.
-ACTION(ReturnNewWebUI) {
- return new WebUIController(arg0);
-}
-
-// Mock the TestChromeWebUIControllerFactory::WebUIProvider to prove that we are
-// called as expected.
-class MockWebUIProvider
- : public TestChromeWebUIControllerFactory::WebUIProvider {
- public:
- MOCK_METHOD2(NewWebUI, WebUIController*(content::WebUI* web_ui,
- const GURL& url));
-};
-
-// Dummy URL location for us to override.
-const char kChromeTestChromeWebUIControllerFactory[] =
- "chrome://ChromeTestChromeWebUIControllerFactory/";
-
-// Sets up and tears down the factory override for our url's host. It is
-// necessary to do this here, rather than in the test declaration, which is too
-// late to catch the possibility of an initial browse to about:blank mistakenly
-// going to this handler.
-class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {
- public:
- virtual void SetUpOnMainThread() OVERRIDE {
- content::WebUIControllerFactory::UnregisterFactoryForTesting(
- ChromeWebUIControllerFactory::GetInstance());
- test_factory_.reset(new TestChromeWebUIControllerFactory);
- content::WebUIControllerFactory::RegisterFactory(test_factory_.get());
- test_factory_->AddFactoryOverride(
- GURL(kChromeTestChromeWebUIControllerFactory).host(), &mock_provider_);
- }
-
- virtual void CleanUpOnMainThread() OVERRIDE {
- test_factory_->RemoveFactoryOverride(
- GURL(kChromeTestChromeWebUIControllerFactory).host());
- content::WebUIControllerFactory::UnregisterFactoryForTesting(
- test_factory_.get());
-
- test_factory_.reset();
- }
-
- protected:
- StrictMock<MockWebUIProvider> mock_provider_;
- scoped_ptr<TestChromeWebUIControllerFactory> test_factory_;
-};
-
-} // namespace
-
-// Test that browsing to our test url causes us to be called once.
-IN_PROC_BROWSER_TEST_F(TestChromeWebUIControllerFactoryTest,
- TestWebUIProvider) {
- const GURL kChromeTestChromeWebUIControllerFactoryURL(
- kChromeTestChromeWebUIControllerFactory);
- EXPECT_CALL(mock_provider_,
- NewWebUI(_, Eq(kChromeTestChromeWebUIControllerFactoryURL)))
- .WillOnce(ReturnNewWebUI());
- ui_test_utils::NavigateToURL(browser(),
- kChromeTestChromeWebUIControllerFactoryURL);
-}
« no previous file with comments | « chrome/test/base/test_chrome_web_ui_controller_factory.cc ('k') | chrome/test/base/web_ui_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698