diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 18:57:08 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 18:57:08 +0000 |
| commit | e21486fa346521c9f129642605229199cb031944 (patch) | |
| tree | c3500b9150c1fdede72bf187f97fa287ad971b85 /chrome/test/data | |
| parent | dab9d65ae623ae9978c898aae916780e30162c1a (diff) | |
| download | chromium_src-e21486fa346521c9f129642605229199cb031944.zip chromium_src-e21486fa346521c9f129642605229199cb031944.tar.gz chromium_src-e21486fa346521c9f129642605229199cb031944.tar.bz2 | |
Revert 135661 - Move the click-to-play tests from plugin_test to browser_test. Then I'm planning on getting rid of plugin_tests (it's huge since it links in chrome, most of the tests are disabled, and we can put them in browser_tests and only work if the plugin is installed).
broke ClickToPlayPluginTest.LoadAllBlockedPlugins:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%282%29/builds/1458/steps/browser_tests/logs/stdio
I made the click to play test use our test plugin instead of Flash so that it can run on all machines.
BUG=121574,113057
TBR=darin
Review URL: http://codereview.chromium.org/10380011
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10384039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
| -rw-r--r-- | chrome/test/data/npapi/clicktoplay.html | 18 | ||||
| -rw-r--r-- | chrome/test/data/npapi/load_all_blocked_plugins.html | 18 |
2 files changed, 12 insertions, 24 deletions
diff --git a/chrome/test/data/npapi/clicktoplay.html b/chrome/test/data/npapi/clicktoplay.html deleted file mode 100644 index 033a59d..0000000 --- a/chrome/test/data/npapi/clicktoplay.html +++ /dev/null @@ -1,18 +0,0 @@ -<html> -<head> -<title>Click To Play</title> -<script> -function PluginCreated() { - document.title = "OK"; -} -</script> -</head> -<embed type="application/vnd.npapi-test" - src="foo" - name="invoke_js_function_on_create" - id="1" - mode="np_embed" -> -</embed> -</body> -</html> diff --git a/chrome/test/data/npapi/load_all_blocked_plugins.html b/chrome/test/data/npapi/load_all_blocked_plugins.html index 8ae05db..e50202d 100644 --- a/chrome/test/data/npapi/load_all_blocked_plugins.html +++ b/chrome/test/data/npapi/load_all_blocked_plugins.html @@ -1,18 +1,24 @@ <html> <head> <script> -var count = 0; -function PluginCreated() { - count++; - document.title = count.toString(); +function onSuccess(name, id) { + setTimeout(onFinished, 0, name, id, "OK"); +} + +function onFailure(name, id, status) { + setTimeout(onFinished, 0, name, id, status); +} + +function onFinished(name, id, result) { + var cookie = name + "." + id + ".status=" + result + "; path=/"; + document.cookie = cookie; } var id = 1; function inject() { var child = document.createElement("div"); child.innerHTML = '<embed type="application/vnd.npapi-test" src="foo" '+ - 'name="invoke_js_function_on_create" ' + - 'id="' + id + '" mode="np_embed">'; + 'name="setup" id="'+id+'" mode="np_embed">'; document.getElementById("content").appendChild(child); id++; } |