From d6ef7684df0f0699bbeb5baceb69998fecd2c36d Mon Sep 17 00:00:00 2001
From: "jam@chromium.org"
<jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 10 Jan 2013 01:42:31 +0000
Subject: Revert 175890: actually, looks like we want this to also help move
chromeos webui pages out of src/chrome. > Revert 175822 > > After more
investigation of what it would take to share the webui code framework from
chrome with content, it didn't seam feasible to do this. The code in chrome
(i.e. ChromeURLDataManager) is heavily tied to chrome, and is used by chrome
for non-webui stuff. The JS code is also specific to Chrome. It seems better
to not bring in all this stuff to content. > > > Allow multiple
WebUIControllerFactory objects to be registered. This makes is possible to
implement webui inside content. > > Review URL:
https://codereview.chromium.org/11783038 > > TBR=jam@chromium.org > Review
URL: https://codereview.chromium.org/11818036
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/11819050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175971 0039d316-1c4b-4281-b951-d872f2087c98
---
content/renderer/render_view_browsertest.cc | 39 +++--------------------------
1 file changed, 4 insertions(+), 35 deletions(-)
(limited to 'content/renderer/render_view_browsertest.cc')
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index c9df9fd..706adc4 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -96,11 +96,11 @@ class WebUITestWebUIControllerFactory : public WebUIControllerFactory {
}
virtual bool UseWebUIForURL(BrowserContext* browser_context,
const GURL& url) const OVERRIDE {
- return GetContentClient()->HasWebUIScheme(url);
+ return HasWebUIScheme(url);
}
virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
const GURL& url) const OVERRIDE {
- return GetContentClient()->HasWebUIScheme(url);
+ return HasWebUIScheme(url);
}
virtual bool IsURLAcceptableForWebUI(
BrowserContext* browser_context,
@@ -110,28 +110,6 @@ class WebUITestWebUIControllerFactory : public WebUIControllerFactory {
}
};
-class WebUITestClient : public ShellContentClient {
- public:
- WebUITestClient() {
- }
-
- virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE {
- return url.SchemeIs(chrome::kChromeUIScheme);
- }
-};
-
-class WebUITestBrowserClient : public ShellContentBrowserClient {
- public:
- WebUITestBrowserClient() {}
-
- virtual WebUIControllerFactory* GetWebUIControllerFactory() OVERRIDE {
- return &factory_;
- }
-
- private:
- WebUITestWebUIControllerFactory factory_;
-};
-
} // namespace
class RenderViewImplTest : public RenderViewTest {
@@ -342,14 +320,8 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
}
TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
- WebUITestClient client;
- WebUITestBrowserClient browser_client;
- ContentClient* old_client = GetContentClient();
- ContentBrowserClient* old_browser_client = GetContentClient()->browser();
-
- SetContentClient(&client);
- GetContentClient()->set_browser_for_testing(&browser_client);
- client.set_renderer_for_testing(old_client->renderer());
+ WebUITestWebUIControllerFactory factory;
+ WebUIControllerFactory::RegisterFactory(&factory);
// Navigations to normal HTTP URLs can be handled locally.
WebKit::WebURLRequest request(GURL("http://foo.com"));
@@ -384,9 +356,6 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
WebKit::WebNavigationPolicyNewForegroundTab,
false);
EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
-
- GetContentClient()->set_browser_for_testing(old_browser_client);
- SetContentClient(old_client);
}
TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
--
cgit v1.1