Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 0bdf8c81b7c53d6f93f1c7dc00174aac987f6d6f..f246fd4c9347841ee1494d1df1e34d10885b9a30 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -226,6 +226,11 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) { |
ChromeContentRendererClient::ChromeContentRendererClient() { |
g_current_client = this; |
+ |
+ extensions::ExtensionsClient::Set( |
+ extensions::ChromeExtensionsClient::GetInstance()); |
+ extensions::ExtensionsRendererClient::Set( |
+ ChromeExtensionsRendererClient::GetInstance()); |
} |
ChromeContentRendererClient::~ChromeContentRendererClient() { |
@@ -236,8 +241,9 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
RenderThread* thread = RenderThread::Get(); |
chrome_observer_.reset(new ChromeRenderProcessObserver(this)); |
+ |
// ChromeRenderViewTest::SetUp() creates its own ExtensionDispatcher and |
- // injects it using SetExtensionDispatcher(). Don't overwrite it. |
+ // injects it using SetExtensionDispatcherForTest(). Don't overwrite it. |
if (!extension_dispatcher_) |
extension_dispatcher_.reset(new extensions::Dispatcher()); |
permissions_policy_delegate_.reset( |
@@ -359,11 +365,6 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( |
extension_resource_scheme); |
- extensions::ExtensionsClient::Set( |
- extensions::ChromeExtensionsClient::GetInstance()); |
- extensions::ExtensionsRendererClient::Set( |
- ChromeExtensionsRendererClient::GetInstance()); |
- |
#if defined(OS_WIN) |
// Report if the renderer process has been patched by chrome_elf. |
// TODO(csharp): Remove once the renderer is no longer getting |
@@ -1246,7 +1247,7 @@ bool ChromeContentRendererClient::ShouldOverridePageVisibilityState( |
return true; |
} |
-void ChromeContentRendererClient::SetExtensionDispatcher( |
+void ChromeContentRendererClient::SetExtensionDispatcherForTest( |
extensions::Dispatcher* extension_dispatcher) { |
extension_dispatcher_.reset(extension_dispatcher); |
permissions_policy_delegate_.reset( |
@@ -1254,6 +1255,11 @@ void ChromeContentRendererClient::SetExtensionDispatcher( |
extension_dispatcher_.get())); |
} |
+extensions::Dispatcher* |
+ChromeContentRendererClient::GetExtensionDispatcherForTest() { |
+ return extension_dispatcher_.get(); |
+} |
+ |
bool ChromeContentRendererClient::CrossesExtensionExtents( |
WebFrame* frame, |
const GURL& new_url, |