diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 06:48:52 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 06:48:52 +0000 |
| commit | f13ab89e3bc7b5cd70afa475899364322d4ad2d0 (patch) | |
| tree | a2e25e2e344be50f71623373e1e88a2729ac8f2d /chrome/browser/safe_browsing | |
| parent | 97c6e19dfb2d4412eed36c6a6a0b6f4ca2f6c724 (diff) | |
| download | chromium_src-f13ab89e3bc7b5cd70afa475899364322d4ad2d0.zip chromium_src-f13ab89e3bc7b5cd70afa475899364322d4ad2d0.tar.gz chromium_src-f13ab89e3bc7b5cd70afa475899364322d4ad2d0.tar.bz2 | |
Copy JavaScript execution to RenderFrame, switch easy cases to use it.
BUG=304341
TEST=no change
Review URL: https://codereview.chromium.org/188893005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 0f994de..5d1b6d1 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -31,6 +31,7 @@ #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" @@ -589,8 +590,7 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { // We don't use ExecuteScriptAndGetValue for this one, since clicking // the button/link may navigate away before the injected javascript can // reply, hanging the test. - rvh->ExecuteJavascriptInWebFrame( - base::string16(), + rvh->GetMainFrame()->ExecuteJavaScript( base::ASCIIToUTF16( "document.getElementById('" + node_id + "').click();\n")); return true; |