Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

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 "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/render_messages.h"
@@ skipping 33 matching lines @@
 using autofill::AutofillAgent;
 using autofill::PasswordAutofillManager;
 
 ChromeRenderViewTest::ChromeRenderViewTest() : extension_dispatcher_(NULL) {
 }
 
 ChromeRenderViewTest::~ChromeRenderViewTest() {
 }
 
 void ChromeRenderViewTest::SetUp() {
-  content::GetContentClient()->set_renderer(&chrome_content_renderer_client_);
+  content::GetContentClient()->set_renderer_for_testing(
+      &chrome_content_renderer_client_);
   extension_dispatcher_ = new ExtensionDispatcher();
   chrome_content_renderer_client_.SetExtensionDispatcher(extension_dispatcher_);
 
   chrome_render_thread_ = new ChromeMockRenderThread();
   render_thread_.reset(chrome_render_thread_);
   content::RenderViewTest::SetUp();
 
   // RenderView doesn't expose it's PasswordAutofillManager or
   // AutofillAgent objects, because it has no need to store them directly
   // (they're stored as RenderViewObserver*).  So just create another set.
   password_autofill_ = new PasswordAutofillManager(view_);
   autofill_agent_ = new AutofillAgent(view_, password_autofill_);
 }
 
 void ChromeRenderViewTest::TearDown() {
   content::RenderViewTest::TearDown();
 
   extension_dispatcher_->OnRenderProcessShutdown();
   extension_dispatcher_ = NULL;
 }