diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 01:50:40 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 01:50:40 +0000 |
| commit | f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf (patch) | |
| tree | dcfef12b9419696ae88f46382978577cd9798f37 /content/test/test_web_contents.cc | |
| parent | 53623a6a4f432c5c075c368963374faf05804eb2 (diff) | |
| download | chromium_src-f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf.zip chromium_src-f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf.tar.gz chromium_src-f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf.tar.bz2 | |
Revert 249516 "Move DidCommitProvisionalLoad code from RenderVie..."
> Move DidCommitProvisionalLoad code from RenderView to RenderFrame.
>
> BUG=304341
> R=creis@chromium.org
>
> Review URL: https://codereview.chromium.org/135723003
Casuses a UAF on ASAN bots in SigninBrowserTest.SigninSkipForNowAndGoBack
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%283%29/builds/22688/steps/browser_tests/logs/stdio
TBR=nasko@chromium.org
Review URL: https://codereview.chromium.org/152143010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/test_web_contents.cc')
| -rw-r--r-- | content/test/test_web_contents.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc index 50f9bb5..d645b31 100644 --- a/content/test/test_web_contents.cc +++ b/content/test/test_web_contents.cc @@ -9,10 +9,8 @@ #include "content/browser/browser_url_handler_impl.h" #include "content/browser/frame_host/cross_process_frame_connector.h" #include "content/browser/frame_host/navigation_entry_impl.h" -#include "content/browser/frame_host/navigator.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/site_instance_impl.h" -#include "content/common/frame_messages.h" #include "content/common/view_messages.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" @@ -70,7 +68,7 @@ void TestWebContents::TestDidNavigateWithReferrer( const GURL& url, const Referrer& referrer, PageTransition transition) { - FrameHostMsg_DidCommitProvisionalLoad_Params params; + ViewHostMsg_FrameNavigate_Params params; params.page_id = page_id; params.url = url; @@ -86,10 +84,7 @@ void TestWebContents::TestDidNavigateWithReferrer( params.is_post = false; params.page_state = PageState::CreateFromURL(url); - RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(render_view_host); - RenderFrameHostImpl* rfh = RenderFrameHostImpl::FromID( - rvh->GetProcess()->GetID(), rvh->main_frame_routing_id()); - frame_tree_.root()->navigator()->DidNavigate(rfh, params); + DidNavigate(render_view_host, params); } WebPreferences TestWebContents::TestGetWebkitPrefs() { |