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

1 files changed, 2 insertions, 4 deletions

diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index 62a85ab..25d7334 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -133,14 +133,13 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
     DCHECK(!g_browser_process);
     g_browser_process = new TestingBrowserProcess;
 
-    DCHECK(!content::GetContentClient());
     content_client_.reset(new chrome::ChromeContentClient);
+    content::SetContentClient(content_client_.get());
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
-    content_client_->set_browser_for_testing(browser_content_client_.get());
+    SetBrowserClientForTesting(browser_content_client_.get());
 #endif
-    content::SetContentClient(content_client_.get());
 
     SetUpHostResolver();
   }
@@ -151,7 +150,6 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
       g_browser_process = NULL;
     }
 
-    DCHECK_EQ(content_client_.get(), content::GetContentClient());
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset();