summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/execute_script_apitest.cc
diff options
context:
space:
mode:
authoreaugusti@chromium.org <eaugusti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-25 23:34:31 +0000
committereaugusti@chromium.org <eaugusti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-25 23:34:31 +0000
commit771baf0c6d0a97c3a10eb6448c2161daf351fb40 (patch)
treee95f17214e578748cc5a99bfdae5a67d8b6052d1 /chrome/browser/extensions/execute_script_apitest.cc
parentf6f72fb8adde6f5c901fd887e275831df8de3b58 (diff)
downloadchromium_src-771baf0c6d0a97c3a10eb6448c2161daf351fb40.zip
chromium_src-771baf0c6d0a97c3a10eb6448c2161daf351fb40.tar.gz
chromium_src-771baf0c6d0a97c3a10eb6448c2161daf351fb40.tar.bz2
Uses the result of injected js as an optional parameter to an optional callback.
This feature requires changes to WebKitt. The diff for these changes are here: https://gist.github.com/1732015 BUG=22349 Review URL: https://chromiumcodereview.appspot.com/9325032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/execute_script_apitest.cc')
-rw-r--r--chrome/browser/extensions/execute_script_apitest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 0594c79..1edb440 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -78,3 +78,9 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptRunAt) {
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/run_at")) << message_;
}
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptCallback) {
+ SetupDelayedHostResolver();
+ ASSERT_TRUE(StartTestServer());
+ ASSERT_TRUE(RunExtensionTest("executescript/callback")) << message_;
+}