Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

content/browser/debugger/devtools_manager_unittest.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 "base/basictypes.h"
 #include "base/time.h"
 #include "content/browser/debugger/devtools_manager_impl.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
-#include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/web_contents/test_web_contents.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/test/test_content_browser_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::DevToolsClientHost;
 using content::DevToolsManager;
 using content::DevToolsManagerImpl;
 using content::RenderViewHostImplTestHarness;
 using content::WebContents;
@@ skipping 58 matching lines @@
 
   bool renderer_unresponsive_received() const {
     return renderer_unresponsive_received_;
   }
 
  private:
   bool renderer_unresponsive_received_;
 };
 
 class DevToolsManagerTestBrowserClient
-    : public content::MockContentBrowserClient {
+    : public content::TestContentBrowserClient {
  public:
   DevToolsManagerTestBrowserClient() {
   }
 
   virtual bool ShouldSwapBrowsingInstanceForNavigation(
       content::BrowserContext* browser_context,
       const GURL& current_url,
       const GURL& new_url) OVERRIDE {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
 };
 
 }  // namespace
 
 class DevToolsManagerTest : public RenderViewHostImplTestHarness {
  public:
   DevToolsManagerTest() {
   }
 
  protected:
   virtual void SetUp() OVERRIDE {
     original_browser_client_ = content::GetContentClient()->browser();
-    content::GetContentClient()->set_browser(&browser_client_);
+    content::GetContentClient()->set_browser_for_testing(&browser_client_);
 
     RenderViewHostImplTestHarness::SetUp();
     TestDevToolsClientHost::ResetCounters();
   }
 
   virtual void TearDown() OVERRIDE {
     RenderViewHostImplTestHarness::TearDown();
-    content::GetContentClient()->set_browser(original_browser_client_);
+    content::GetContentClient()->set_browser_for_testing(
+        original_browser_client_);
   }
 
  private:
   content::ContentBrowserClient* original_browser_client_;
   DevToolsManagerTestBrowserClient browser_client_;
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   DevToolsManagerImpl manager;
 
@@ skipping 97 matching lines @@
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(rvh(), 1, url, content::PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
       DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh())));
   client_host.Close(DevToolsManager::GetInstance());
 }