Remove unnecessary ContentBrowserClient in test.

content/browser/devtools/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/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ skipping 69 matching lines @@
   }
 
   bool renderer_unresponsive_received() const {
     return renderer_unresponsive_received_;
   }
 
  private:
   bool renderer_unresponsive_received_;
 };
 
-class DevToolsManagerTestBrowserClient : public TestContentBrowserClient {
- public:
-  DevToolsManagerTestBrowserClient() {
-  }
-
-  virtual bool ShouldSwapProcessesForNavigation(
-      SiteInstance* site_instance,
-      const GURL& current_url,
-      const GURL& new_url) OVERRIDE {
-    return true;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
-};
-
 }  // namespace
 
 class DevToolsManagerTest : public RenderViewHostImplTestHarness {
  protected:
   virtual void SetUp() OVERRIDE {
-    original_browser_client_ = SetBrowserClientForTesting(&browser_client_);
-
     RenderViewHostImplTestHarness::SetUp();
     TestDevToolsClientHost::ResetCounters();
   }
-
-  virtual void TearDown() OVERRIDE {
-    RenderViewHostImplTestHarness::TearDown();
-    SetBrowserClientForTesting(original_browser_client_);
-  }
-
- private:
-  ContentBrowserClient* original_browser_client_;
-  DevToolsManagerTestBrowserClient browser_client_;
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   DevToolsManager* manager = DevToolsManager::GetInstance();
 
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(rvh()));
   EXPECT_FALSE(agent->IsAttached());
 
   TestDevToolsClientHost client_host;
@@ skipping 58 matching lines @@
       FROM_HERE,
       base::MessageLoop::QuitClosure(),
       TimeDelta::FromMilliseconds(10));
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(delegate.renderer_unresponsive_received());
 
   contents()->SetDelegate(NULL);
 }
 
 TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
-  contents()->transition_cross_site = true;
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
   controller().LoadURL(
       url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
 
   TestDevToolsClientHost client_host;
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   devtools_manager->RegisterDevToolsClientHostFor(
@@ skipping 67 matching lines @@
   manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
 
   manager->DispatchOnInspectorBackend(&client_host, "message1");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
 
   client_host.Close(manager);
 }
 
 }  // namespace content