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

content/test/content_test_launcher.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/public/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 18 matching lines @@
 
 namespace content {
 
 class ContentShellTestSuiteInitializer
     : public testing::EmptyTestEventListener {
  public:
   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);
   }
 
  private:
   scoped_ptr<ShellContentClient> content_client_;
   scoped_ptr<ShellContentBrowserClient> browser_content_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentShellTestSuiteInitializer);
@@ skipping 69 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
 }  // namespace content
 
 int main(int argc, char** argv) {
   content::ContentTestLauncherDelegate launcher_delegate;
   return LaunchTests(&launcher_delegate, argc, argv);
 }