diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 21:52:37 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 21:52:37 +0000 |
| commit | 510607c735571c67d0ceb0461b0fc797d08abbcd (patch) | |
| tree | 17789d8fcbe98044db423deb80d7a83b3a871ce9 /chrome/test/data/npapi | |
| parent | c8ac905312f63f24f849de5d8e85bd603f17a5e7 (diff) | |
| download | chromium_src-510607c735571c67d0ceb0461b0fc797d08abbcd.zip chromium_src-510607c735571c67d0ceb0461b0fc797d08abbcd.tar.gz chromium_src-510607c735571c67d0ceb0461b0fc797d08abbcd.tar.bz2 | |
Move content settings data files that are in chrome\test\data\npapi up one level. That makes the only files in that directory those needed by plugin_browsertests.cc, so we can move it to content\test\data\npapi. Also remove click_to_play.html since it wasn't used.
BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10808062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/npapi')
| -rw-r--r-- | chrome/test/data/npapi/click_to_play.html | 13 | ||||
| -rw-r--r-- | chrome/test/data/npapi/clicktoplay.html | 18 | ||||
| -rw-r--r-- | chrome/test/data/npapi/load_all_blocked_plugins.html | 24 |
3 files changed, 0 insertions, 55 deletions
diff --git a/chrome/test/data/npapi/click_to_play.html b/chrome/test/data/npapi/click_to_play.html deleted file mode 100644 index 1ad3678..0000000 --- a/chrome/test/data/npapi/click_to_play.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> -<head> -<script src="npapi.js"></script> -</head> -<body> -<embed type="application/vnd.npapi-test" - src="foo" - name="setup" - id="1" - mode="np_embed" -> -</body> -</html>
\ No newline at end of file diff --git a/chrome/test/data/npapi/clicktoplay.html b/chrome/test/data/npapi/clicktoplay.html deleted file mode 100644 index 204c511..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 deleted file mode 100644 index 8ae05db..0000000 --- a/chrome/test/data/npapi/load_all_blocked_plugins.html +++ /dev/null @@ -1,24 +0,0 @@ -<html> -<head> -<script> -var count = 0; -function PluginCreated() { - count++; - document.title = count.toString(); -} - -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">'; - document.getElementById("content").appendChild(child); - id++; -} -</script> -</head> -<body onload="inject();"> -<div id="content"></div> -</body> -</html> |