diff options
| author | cbiesinger@chromium.org <cbiesinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 01:53:12 +0000 |
|---|---|---|
| committer | cbiesinger@chromium.org <cbiesinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 01:53:12 +0000 |
| commit | a2187635d6f90c500f7408010c2773588e5cd6ab (patch) | |
| tree | 41dc4d95db1fac78a12d339e6366e3c966b61eea /content/browser/security_exploit_browsertest.cc | |
| parent | 9f405901c876d3d67de53370d28732abf053239a (diff) | |
| download | chromium_src-a2187635d6f90c500f7408010c2773588e5cd6ab.zip chromium_src-a2187635d6f90c500f7408010c2773588e5cd6ab.tar.gz chromium_src-a2187635d6f90c500f7408010c2773588e5cd6ab.tar.bz2 | |
Revert "Move OpenURL from RenderView to RenderFrame."
This reverts commit e0dd068fdd87221bdd30c99c380835038f804f07.
Suspected of causing layouttest failures. Specifically, some are
timing out, and some are no longer printing messages like:
Policy delegate: attempt to load http://127.0.0.1:8000/misc/resources/iframe-policy-2.html with navigation type
'link clicked'
e.g. http/tests/misc/policy-delegate-called-twice.html
https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux/27954/layout-test-results/results.html
TBR=nasko@chromium.org
BUG=
Review URL: https://codereview.chromium.org/181063024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/security_exploit_browsertest.cc')
| -rw-r--r-- | content/browser/security_exploit_browsertest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index 4da524a..883fb8c 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -6,7 +6,6 @@ #include "base/containers/hash_tables.h" #include "content/browser/dom_storage/dom_storage_context_wrapper.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" -#include "content/browser/frame_host/navigator.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" @@ -57,10 +56,10 @@ RenderViewHostImpl* PrepareToDuplicateHosts(Shell* shell, // Now, simulate a link click coming from the renderer. GURL extension_url("https://bar.com/files/simple_page.html"); WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell->web_contents()); - wc->GetFrameTree()->root()->navigator()->RequestOpenURL( - wc->GetFrameTree()->root()->current_frame_host(), extension_url, + wc->RequestOpenURL( + shell->web_contents()->GetRenderViewHost(), extension_url, Referrer(), CURRENT_TAB, - wc->GetFrameTree()->root()->current_frame_host()->GetRoutingID(), + wc->GetFrameTree()->GetMainFrame()->GetRoutingID(), false, true); // Since the navigation above requires a cross-process swap, there will be a |