summaryrefslogtreecommitdiffstats
path: root/content/browser/debugger
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 18:17:26 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 18:17:26 +0000
commitf0576397e6ce23be5819fdd25b5aae31e7906b1b (patch)
tree69a38c07933022012756380220e894b168a2e311 /content/browser/debugger
parent8590c327d60a7304d339bf6e43a103b6e33710f0 (diff)
downloadchromium_src-f0576397e6ce23be5819fdd25b5aae31e7906b1b.zip
chromium_src-f0576397e6ce23be5819fdd25b5aae31e7906b1b.tar.gz
chromium_src-f0576397e6ce23be5819fdd25b5aae31e7906b1b.tar.bz2
Revert 139933 - Clean up RenderViewHostManager swapping logic.
Reverting due to http://crbug.com/131376. Makes the difference between swapping SiteInstances and swapping BrowsingInstances explicit, and adds CHECKs to enforce invariants more effectively. BUG=123007 TEST=No functionality change. Review URL: https://chromiumcodereview.appspot.com/9965091 TBR=creis@chromium.org Review URL: https://chromiumcodereview.appspot.com/10546029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger')
-rw-r--r--content/browser/debugger/devtools_manager_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index c6a1507..2529436 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -97,8 +97,7 @@ class DevToolsManagerTestBrowserClient
DevToolsManagerTestBrowserClient() {
}
- virtual bool ShouldSwapBrowsingInstanceForNavigation(
- content::BrowserContext* browser_context,
+ virtual bool ShouldSwapProcessesForNavigation(
const GURL& current_url,
const GURL& new_url) OVERRIDE {
return true;