diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 21:51:46 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 21:51:46 +0000 |
| commit | 74ce1adb65e73eb76fe37326cf754acfc246380a (patch) | |
| tree | 53c55f1b4905f5e0bb1faa843a14ff98fd02a852 /chrome/test/base/browser_with_test_window_test.cc | |
| parent | 3fbd9c17a738598053f5ad5cba746370075166cb (diff) | |
| download | chromium_src-74ce1adb65e73eb76fe37326cf754acfc246380a.zip chromium_src-74ce1adb65e73eb76fe37326cf754acfc246380a.tar.gz chromium_src-74ce1adb65e73eb76fe37326cf754acfc246380a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/browser_with_test_window_test.cc')
| -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 b65704a..3027c13 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -77,8 +77,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()-> @@ -103,10 +101,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 |