Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The main reasons are that it makes content's embedder interfaces harder to change if they're reused by the embedder, and that its makes it confusing for embedder code when there are multiple ways to do the same thing.

BUG=227047
Review URL: https://codereview.chromium.org/13409003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192649 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 14 deletions

diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index aa91303..90e4d8c 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -60,8 +60,7 @@ void ContentBrowserTest::SetUp() {
   // and set up renderer.
   if (command_line->HasSwitch(switches::kSingleProcess)) {
     single_process_renderer_client_.reset(new ShellContentRendererClient);
-    GetContentClient()->set_renderer_for_testing(
-        single_process_renderer_client_.get());
+    SetRendererClientForTesting(single_process_renderer_client_.get());
   }
 
 #if defined(OS_MACOSX)
@@ -131,10 +130,8 @@ void ContentBrowserTest::RunTestOnMainThreadLoop() {
 }
 
 Shell* ContentBrowserTest::CreateBrowser() {
-  ShellContentBrowserClient* browser_client =
-      static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
   return Shell::CreateNewWindow(
-      browser_client->browser_context(),
+      ShellContentBrowserClient::Get()->browser_context(),
       GURL(chrome::kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
@@ -142,10 +139,8 @@ Shell* ContentBrowserTest::CreateBrowser() {
 }
 
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
-  ShellContentBrowserClient* browser_client =
-      static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
   return Shell::CreateNewWindow(
-      browser_client->off_the_record_browser_context(),
+      ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(chrome::kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index aa1f362..2a662e7 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -36,15 +36,13 @@ class ContentShellTestSuiteInitializer
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
-    DCHECK(!GetContentClient());
     content_client_.reset(new ShellContentClient);
     browser_content_client_.reset(new ShellContentBrowserClient());
-    content_client_->set_browser_for_testing(browser_content_client_.get());
     SetContentClient(content_client_.get());
+    SetBrowserClientForTesting(browser_content_client_.get());
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
-    DCHECK_EQ(content_client_.get(), GetContentClient());
     browser_content_client_.reset();
     content_client_.reset();
     SetContentClient(NULL);
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 1ebcce9..c206283 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -87,12 +87,11 @@ class WebRTCMockRenderProcess : public RenderProcess {
 class ReplaceContentClientRenderer {
  public:
   explicit ReplaceContentClientRenderer(ContentRendererClient* new_renderer) {
-    saved_renderer_ = GetContentClient()->renderer();
-    GetContentClient()->set_renderer_for_testing(new_renderer);
+    saved_renderer_ = SetRendererClientForTesting(new_renderer);
   }
   ~ReplaceContentClientRenderer() {
     // Restore the original renderer.
-    GetContentClient()->set_renderer_for_testing(saved_renderer_);
+    SetRendererClientForTesting(saved_renderer_);
   }
  private:
   ContentRendererClient* saved_renderer_;