summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view_unittest.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-17 00:06:27 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-17 00:06:27 +0000
commit49fed325fbf10a6c612b82360b941d500d8a2fa8 (patch)
treed4605501b1940f2df25948714a4540a7c8b33b7c /chrome/renderer/render_view_unittest.cc
parent5df5165d0e0d7e6493dbca6d4c98a173a616467d (diff)
downloadchromium_src-49fed325fbf10a6c612b82360b941d500d8a2fa8.zip
chromium_src-49fed325fbf10a6c612b82360b941d500d8a2fa8.tar.gz
chromium_src-49fed325fbf10a6c612b82360b941d500d8a2fa8.tar.bz2
First pass as implementing the greasemonkey API. This patch
includes a javascript file with stubbed versions of all the greasemoney API methods as well as changes to the Greasemonkey slave to inject this javascript file along with other user scripts into the page.I also have a userscript I'm using for the unit testing of the API methods. I don't think there is a good place for it in the chrome tree (if there is I'd like to know), but you can view it here: http://skrul.com/greasemonkey/test.user.js Right now all the tests fail except for testLog and testUnsafeWindow. Review URL: http://codereview.chromium.org/18183 Patch from Steve Krulewitz <skrulx@gmail.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view_unittest.cc')
-rw-r--r--chrome/renderer/render_view_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index 71ab2e2..2477c93 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -36,7 +36,9 @@ class RenderViewTest : public testing::Test {
// Executes the given JavaScript in the context of the main frame. The input
// is a NULL-terminated UTF-8 string.
void ExecuteJavaScript(const char* js) {
- GetMainFrame()->ExecuteJavaScript(js, GURL());
+ GetMainFrame()->ExecuteJavaScript(js,
+ GURL(), // script url
+ 1); // base line number
}
// Loads the given HTML into the main frame as a data: URL.