Clean up RenderViewHostManager swapping logic.

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/browser_context.h"

[darin (slow to review), 2012/05/31 04:43:08]

nit: this include is not needed, right?

[Charlie Reis, 2012/05/31 17:58:23]

Done.

 #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 "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::DevToolsClientHost;
@@ skipping 67 matching lines @@
  private:
   bool renderer_unresponsive_received_;
 };
 
 class DevToolsManagerTestBrowserClient
     : public content::MockContentBrowserClient {
  public:
   DevToolsManagerTestBrowserClient() {
   }
 
-  virtual bool ShouldSwapProcessesForNavigation(
+  virtual bool ShouldSwapBrowsingInstancesForNavigation(
+      content::BrowserContext* browser_context,
       const GURL& current_url,
       const GURL& new_url) OVERRIDE {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
 };
 
 }  // namespace
@@ skipping 125 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());
 }