Move more extensions code into ChromeExtensionsRendererClient.

chrome/test/base/chrome_render_view_test.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 "chrome/test/base/chrome_render_view_test.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_content_client.h"
@@ skipping 11 matching lines @@
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
+#include "chrome/renderer/extensions/chrome_extensions_renderer_client.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/common/extension.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/event_bindings.h"
 #endif
 
 using autofill::AutofillAgent;
 using autofill::PasswordAutofillAgent;
 using autofill::PasswordGenerationAgent;
 using blink::WebFrame;
@@ skipping 60 matching lines @@
       new autofill::TestPasswordGenerationAgent(view_->GetMainRenderFrame(),
                                                 password_autofill_agent_);
   autofill_agent_ = new NiceMock<MockAutofillAgent>(view_->GetMainRenderFrame(),
                                                     password_autofill_agent_,
                                                     password_generation_);
 }
 
 void ChromeRenderViewTest::TearDown() {
   base::RunLoop().RunUntilIdle();
 #if defined(ENABLE_EXTENSIONS)
-  ChromeContentRendererClient* client =
-      static_cast<ChromeContentRendererClient*>(content_renderer_client_.get());
-  client->GetExtensionDispatcherForTest()->OnRenderProcessShutdown();
+  ChromeExtensionsRendererClient* ext_client =
+      ChromeExtensionsRendererClient::GetInstance();
+  ext_client->GetExtensionDispatcherForTest()->OnRenderProcessShutdown();
 #endif
 
 #if defined(LEAK_SANITIZER)
   // Do this before shutting down V8 in RenderViewTest::TearDown().
   // http://crbug.com/328552
   __lsan_do_leak_check();
 #endif
   content::RenderViewTest::TearDown();
 }
 
 content::ContentClient* ChromeRenderViewTest::CreateContentClient() {
   return new ChromeContentClient();
 }
 
 content::ContentBrowserClient*
 ChromeRenderViewTest::CreateContentBrowserClient() {
   return new ChromeContentBrowserClient();
 }
 
 content::ContentRendererClient*
 ChromeRenderViewTest::CreateContentRendererClient() {
   ChromeContentRendererClient* client = new ChromeContentRendererClient();
 #if defined(ENABLE_EXTENSIONS)
   extension_dispatcher_delegate_.reset(
       new ChromeExtensionsDispatcherDelegate());
-  client->SetExtensionDispatcherForTest(
-      new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
+  ChromeExtensionsRendererClient* ext_client =
+      ChromeExtensionsRendererClient::GetInstance();
+  ext_client->SetExtensionDispatcherForTest(
+      make_scoped_ptr(
+          new extensions::Dispatcher(extension_dispatcher_delegate_.get())));
 #endif
 #if defined(ENABLE_SPELLCHECK)
   client->SetSpellcheck(new SpellCheck());
 #endif
   return client;
 }
 
 void ChromeRenderViewTest::EnableUserGestureSimulationForAutofill() {
   EXPECT_CALL(*(static_cast<MockAutofillAgent*>(autofill_agent_)),
               IsUserGesture()).WillRepeatedly(Return(true));
 }
 
 void ChromeRenderViewTest::DisableUserGestureSimulationForAutofill() {
   EXPECT_CALL(*(static_cast<MockAutofillAgent*>(autofill_agent_)),
               IsUserGesture()).WillRepeatedly(Return(false));
 }