diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 23:01:51 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 23:01:51 +0000 |
| commit | 6dfdc020fa65c8ad5840ccb6c78021a578be8843 (patch) | |
| tree | a1121f6713ec1be2b57f28527c41f436967905b9 /chrome/browser/renderer_host | |
| parent | a9dc9130e3612bb613575c4ae210148d1fbb5157 (diff) | |
| download | chromium_src-6dfdc020fa65c8ad5840ccb6c78021a578be8843.zip chromium_src-6dfdc020fa65c8ad5840ccb6c78021a578be8843.tar.gz chromium_src-6dfdc020fa65c8ad5840ccb6c78021a578be8843.tar.bz2 | |
Don't create pending entries when a navigation is initiated by the page.
If the page reloads while such a navigation happens, we could end up with the wrong pending entry.
Also make sure TestTabContents::NavigateAndCommit() does commit on the right RVH.
BUG=51680
TEST=See bug for steps.
Review URL: http://codereview.chromium.org/3257002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/test/test_render_view_host.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/chrome/browser/renderer_host/test/test_render_view_host.cc index 57ef915..bca21e1 100644 --- a/chrome/browser/renderer_host/test/test_render_view_host.cc +++ b/chrome/browser/renderer_host/test/test_render_view_host.cc @@ -236,6 +236,8 @@ TestingProfile* RenderViewHostTestHarness::profile() { } MockRenderProcessHost* RenderViewHostTestHarness::process() { + if (pending_rvh()) + return static_cast<MockRenderProcessHost*>(pending_rvh()->process()); return static_cast<MockRenderProcessHost*>(rvh()->process()); } |