diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 18:30:43 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 18:30:43 +0000 |
| commit | b6987e0e556a5f72e5e783aae0e30e883cf66f91 (patch) | |
| tree | fb07c2c5803510285ef0d030d42eb6ced5a8d2b7 /content/browser/dom_storage | |
| parent | 53bc1a4364a3a75344e20f94aedff2eca2f6f9af (diff) | |
| download | chromium_src-b6987e0e556a5f72e5e783aae0e30e883cf66f91.zip chromium_src-b6987e0e556a5f72e5e783aae0e30e883cf66f91.tar.gz chromium_src-b6987e0e556a5f72e5e783aae0e30e883cf66f91.tar.bz2 | |
Simplify ExecuteJavaScript* functions.
Remove the "Java" and rename to ExecuteScript*. This better matches
conventions elsewhere in the codebase.
Introduce ExecuteScriptInFrame* variants for the less common case
where script execution in a subframe is desired.
Make it possible to pass the ExecuteScript* family of functions either
a WebContents pointer or a RenderViewHost pointer to further simplify
callsites.
R=jam@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11753009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/dom_storage')
| -rw-r--r-- | content/browser/dom_storage/dom_storage_browsertest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index 84405f2..3591c67 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -28,9 +28,8 @@ class DomStorageBrowserTest : public ContentBrowserTest { std::string result = the_browser->web_contents()->GetURL().ref(); if (result != "pass") { std::string js_result; - ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - the_browser->web_contents()->GetRenderViewHost(), - std::string(), + ASSERT_TRUE(ExecuteScriptAndExtractString( + the_browser->web_contents(), "window.domAutomationController.send(getLog())", &js_result)); FAIL() << "Failed: " << js_result; |