Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

chrome/test/base/chrome_test_suite.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_test_suite.h"
 
 #if defined(OS_CHROMEOS)
 #include <stdio.h>
 #include <unistd.h>
 #endif
@@ skipping 115 matching lines @@
 
 class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
  public:
   ChromeTestSuiteInitializer() {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     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();
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     if (g_browser_process) {
       delete g_browser_process;
       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();
 #endif
     content_client_.reset();
     content::SetContentClient(NULL);
 
     TearDownHostResolver();
   }
 
@@ skipping 116 matching lines @@
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
 
   base::StatsTable::set_current(NULL);
   stats_table_.reset();
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }