| Index: content/browser/devtools/devtools_manager_unittest.cc
|
| diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
|
| index 46c198cc05cc61320fe94fbf1a5a4729a55f6606..f223c6020c7d1d9521793cef54ace7d57423b383 100644
|
| --- a/content/browser/devtools/devtools_manager_unittest.cc
|
| +++ b/content/browser/devtools/devtools_manager_unittest.cc
|
| @@ -87,41 +87,14 @@ class TestWebContentsDelegate : public WebContentsDelegate {
|
| 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) {
|
| @@ -200,7 +173,6 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
|
| }
|
|
|
| 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(
|
|
|