summaryrefslogtreecommitdiffstats
path: root/content/browser/security_exploit_browsertest.cc
diff options
context:
space:
mode:
authornasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 00:02:20 +0000
committernasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 00:02:20 +0000
commite0dd068fdd87221bdd30c99c380835038f804f07 (patch)
treedea2c901bb21ccddb2055ef3e1eae03a183474bd /content/browser/security_exploit_browsertest.cc
parent779f58faac4f220505fbfcd7eb75d4e53c3c6aaf (diff)
downloadchromium_src-e0dd068fdd87221bdd30c99c380835038f804f07.zip
chromium_src-e0dd068fdd87221bdd30c99c380835038f804f07.tar.gz
chromium_src-e0dd068fdd87221bdd30c99c380835038f804f07.tar.bz2
Move OpenURL from RenderView to RenderFrame.
BUG=304341 Review URL: https://codereview.chromium.org/165063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/security_exploit_browsertest.cc')
-rw-r--r--content/browser/security_exploit_browsertest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
index 883fb8c..4da524a 100644
--- a/content/browser/security_exploit_browsertest.cc
+++ b/content/browser/security_exploit_browsertest.cc
@@ -6,6 +6,7 @@
#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"
@@ -56,10 +57,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->RequestOpenURL(
- shell->web_contents()->GetRenderViewHost(), extension_url,
+ wc->GetFrameTree()->root()->navigator()->RequestOpenURL(
+ wc->GetFrameTree()->root()->current_frame_host(), extension_url,
Referrer(), CURRENT_TAB,
- wc->GetFrameTree()->GetMainFrame()->GetRoutingID(),
+ wc->GetFrameTree()->root()->current_frame_host()->GetRoutingID(),
false, true);
// Since the navigation above requires a cross-process swap, there will be a