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

chrome/browser/extensions/api/web_navigation/web_navigation_apitest.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 <list>
 #include <set>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 333 matching lines @@
  public:
   WebNavigationApiTest() {}
   virtual ~WebNavigationApiTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
 
     test_navigation_listener_ = new TestNavigationListener();
     content_browser_client_.reset(
         new TestContentBrowserClient(test_navigation_listener_.get()));
-    original_content_browser_client_ = content::GetContentClient()->browser();
-    content::GetContentClient()->set_browser_for_testing(
+    original_content_browser_client_ = content::SetBrowserClientForTesting(
         content_browser_client_.get());
 
     FrameNavigationState::set_allow_extension_scheme(true);
 
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kAllowLegacyExtensionManifests);
 
     host_resolver()->AddRule("*", "127.0.0.1");
     ASSERT_TRUE(StartTestServer());
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::TearDownInProcessBrowserTestFixture();
-    content::GetContentClient()->set_browser_for_testing(
-        original_content_browser_client_);
+    content::SetBrowserClientForTesting(original_content_browser_client_);
   }
 
   TestNavigationListener* test_navigation_listener() {
     return test_navigation_listener_.get();
   }
 
  private:
   scoped_refptr<TestNavigationListener> test_navigation_listener_;
   scoped_ptr<TestContentBrowserClient> content_browser_client_;
   content::ContentBrowserClient* original_content_browser_client_;
@@ skipping 337 matching lines @@
   url = GURL(base::StringPrintf(
       "http://www.a.com:%d/"
           "files/extensions/api_test/webnavigation/crash/b.html",
       test_server()->host_port_pair().port()));
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace extensions