diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 01:27:26 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 01:27:26 +0000 |
| commit | c4572ff9f3a76e2ee5e34c9f3acce9a560043876 (patch) | |
| tree | afc28690a5377a794f2c28b00053486eedfec79f /chrome/test | |
| parent | b51d88aab10cd6f5825f7adf069154cbb7e2f591 (diff) | |
| download | chromium_src-c4572ff9f3a76e2ee5e34c9f3acce9a560043876.zip chromium_src-c4572ff9f3a76e2ee5e34c9f3acce9a560043876.tar.gz chromium_src-c4572ff9f3a76e2ee5e34c9f3acce9a560043876.tar.bz2 | |
Merge 114862 - Make page IDs be specific to a RenderView rather than global to its process.
This avoids races that cause the browser to kill the renderer.
BUG=106616
TEST=Restore Chrome with an extension's options page showing.
Review URL: http://codereview.chromium.org/8910020
TBR=creis@chromium.org
Review URL: http://codereview.chromium.org/9007036
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/browser_with_test_window_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index f4077a5..1751ac5 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -74,8 +74,6 @@ void BrowserWithTestWindowTest::CommitPendingLoad( TestRenderViewHost* old_rvh = TestRenderViewHostForTab(controller->tab_contents()); - MockRenderProcessHost* mock_rph = static_cast<MockRenderProcessHost*>( - old_rvh->process()); TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>( controller->tab_contents()->render_manager_for_testing()-> @@ -100,10 +98,10 @@ void BrowserWithTestWindowTest::CommitPendingLoad( controller->pending_entry()->transition_type()); } else { test_rvh->SendNavigateWithTransition( - mock_rph->max_page_id() + 1, + controller->tab_contents()-> + GetMaxPageIDForSiteInstance(test_rvh->site_instance()) + 1, controller->pending_entry()->url(), controller->pending_entry()->transition_type()); - mock_rph->UpdateMaxPageID(mock_rph->max_page_id() + 1); } // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation |