Revert 175822

content/renderer/render_view_browsertest.cc

 // 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 "base/basictypes.h"
 
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/intents_messages.h"
@@ skipping 78 matching lines @@
   virtual WebUIController* CreateWebUIControllerForURL(
       WebUI* web_ui, const GURL& url) const OVERRIDE {
     return NULL;
   }
   virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
                                      const GURL& url) const OVERRIDE {
     return WebUI::kNoWebUI;
   }
   virtual bool UseWebUIForURL(BrowserContext* browser_context,
                               const GURL& url) const OVERRIDE {
-    return HasWebUIScheme(url);
+    return GetContentClient()->HasWebUIScheme(url);
   }
   virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
                                       const GURL& url) const OVERRIDE {
-    return HasWebUIScheme(url);
+    return GetContentClient()->HasWebUIScheme(url);
   }
   virtual bool IsURLAcceptableForWebUI(
       BrowserContext* browser_context,
       const GURL& url,
       bool data_urls_allowed) const OVERRIDE {
     return false;
   }
 };
 
+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 {
  public:
   RenderViewImplTest() {
     // Attach a pseudo keyboard device to this object.
     mock_keyboard_.reset(new MockKeyboard());
   }
 
   RenderViewImpl* view() {
@@ skipping 190 matching lines @@
   WebKit::WebHTTPBody body = item.httpBody();
   WebKit::WebHTTPBody::Element element;
   bool successful = body.elementAt(0, element);
   EXPECT_TRUE(successful);
   EXPECT_EQ(WebKit::WebHTTPBody::Element::TypeData, element.type);
   EXPECT_EQ(length, element.data.size());
   EXPECT_EQ(0, memcmp(raw_data, element.data.data(), length));
 }
 
 TEST_F(RenderViewImplTest, DecideNavigationPolicy) {
-  WebUITestWebUIControllerFactory factory;
-  WebUIControllerFactory::RegisterFactory(&factory);
+  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());
 
   // Navigations to normal HTTP URLs can be handled locally.
   WebKit::WebURLRequest request(GURL("http://foo.com"));
   WebKit::WebNavigationPolicy policy = view()->decidePolicyForNavigation(
       GetMainFrame(),
       request,
       WebKit::WebNavigationTypeLinkClicked,
       WebKit::WebNode(),
       WebKit::WebNavigationPolicyCurrentTab,
       false);
@@ skipping 14 matching lines @@
   // Verify that popup links to WebUI URLs also are sent to browser.
   WebKit::WebURLRequest popup_request(GURL("chrome://foo"));
   policy = view()->decidePolicyForNavigation(
       GetMainFrame(),
       popup_request,
       WebKit::WebNavigationTypeLinkClicked,
       WebKit::WebNode(),
       WebKit::WebNavigationPolicyNewForegroundTab,
       false);
   EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy);
+
+  GetContentClient()->set_browser_for_testing(old_browser_client);
+  SetContentClient(old_client);
 }
 
 TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) {
   // Enable bindings to simulate a WebUI view.
   view()->OnAllowBindings(BINDINGS_POLICY_WEB_UI);
 
   // Navigations to normal HTTP URLs will be sent to browser process.
   WebKit::WebURLRequest request(GURL("http://foo.com"));
   WebKit::WebNavigationPolicy policy = view()->decidePolicyForNavigation(
       GetMainFrame(),
@@ skipping 1453 matching lines @@
   EXPECT_EQ(7, info.selectionEnd);
   view()->OnSetEditableSelectionOffsets(4, 8);
   view()->OnExtendSelectionAndDelete(2, 5);
   info = view()->webview()->textInputInfo();
   EXPECT_EQ("abuvwxyz", info.value);
   EXPECT_EQ(2, info.selectionStart);
   EXPECT_EQ(2, info.selectionEnd);
 }
 
 }  // namespace content