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

content/test/webrtc_audio_device_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 "content/test/webrtc_audio_device_test.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 50 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WebRTCMockRenderProcess);
 };
 
 // Utility scoped class to replace the global content client's renderer for the
 // duration of the test.
 class ReplaceContentClientRenderer {
  public:
   explicit ReplaceContentClientRenderer(
       content::ContentRendererClient* new_renderer) {
     saved_renderer_ = content::GetContentClient()->renderer();
-    content::GetContentClient()->set_renderer(new_renderer);
+    content::GetContentClient()->set_renderer_for_testing(new_renderer);
   }
   ~ReplaceContentClientRenderer() {
     // Restore the original renderer.
-    content::GetContentClient()->set_renderer(saved_renderer_);
+    content::GetContentClient()->set_renderer_for_testing(saved_renderer_);
   }
  private:
   content::ContentRendererClient* saved_renderer_;
   DISALLOW_COPY_AND_ASSIGN(ReplaceContentClientRenderer);
 };
 
 namespace {
 
 class MockResourceContext : public content::ResourceContext {
  public:
@@ skipping 30 matching lines @@
 }
 
 WebRTCAudioDeviceTest::~WebRTCAudioDeviceTest() {}
 
 void WebRTCAudioDeviceTest::SetUp() {
   // This part sets up a RenderThread environment to ensure that
   // RenderThread::current() (<=> TLS pointer) is valid.
   // Main parts are inspired by the RenderViewFakeResourcesTest.
   // Note that, the IPC part is not utilized in this test.
   saved_content_renderer_.reset(
-      new ReplaceContentClientRenderer(&mock_content_renderer_client_));
+      new ReplaceContentClientRenderer(&content_renderer_client_));
   mock_process_.reset(new WebRTCMockRenderProcess());
   ui_thread_.reset(new content::TestBrowserThread(content::BrowserThread::UI,
                                                   MessageLoop::current()));
 
   // Construct the resource context on the UI thread.
   resource_context_.reset(new MockResourceContext);
 
   static const char kThreadName[] = "RenderThread";
   ChildProcess::current()->io_message_loop()->PostTask(FROM_HERE,
       base::Bind(&WebRTCAudioDeviceTest::InitializeIOThread,
@@ skipping 212 matching lines @@
 WebRTCTransportImpl::~WebRTCTransportImpl() {}
 
 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
   return network_->ReceivedRTPPacket(channel, data, len);
 }
 
 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
                                         int len) {
   return network_->ReceivedRTCPPacket(channel, data, len);
 }