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 | |
| 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
| -rw-r--r-- | chrome/browser/content_settings/content_settings_browsertest.cc | 6 | ||||
| -rw-r--r-- | chrome/test/data/clicktoplay.html (renamed from chrome/test/data/npapi/clicktoplay.html) | 0 | ||||
| -rw-r--r-- | chrome/test/data/load_all_blocked_plugins.html (renamed from chrome/test/data/npapi/load_all_blocked_plugins.html) | 0 | ||||
| -rw-r--r-- | chrome/test/data/npapi/click_to_play.html | 13 |
4 files changed, 2 insertions, 17 deletions
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index dc6720b..92ba0f1 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -103,8 +103,7 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) { CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); GURL url = ui_test_utils::GetTestUrl( - FilePath().AppendASCII("npapi"), - FilePath().AppendASCII("clicktoplay.html")); + FilePath(), FilePath().AppendASCII("clicktoplay.html")); ui_test_utils::NavigateToURL(browser(), url); string16 expected_title(ASCIIToUTF16("OK")); @@ -124,8 +123,7 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, LoadAllBlockedPlugins) { CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); GURL url = ui_test_utils::GetTestUrl( - FilePath().AppendASCII("npapi"), - FilePath().AppendASCII("load_all_blocked_plugins.html")); + FilePath(), FilePath().AppendASCII("load_all_blocked_plugins.html")); ui_test_utils::NavigateToURL(browser(), url); string16 expected_title1(ASCIIToUTF16("1")); diff --git a/chrome/test/data/npapi/clicktoplay.html b/chrome/test/data/clicktoplay.html index 204c511..204c511 100644 --- a/chrome/test/data/npapi/clicktoplay.html +++ b/chrome/test/data/clicktoplay.html diff --git a/chrome/test/data/npapi/load_all_blocked_plugins.html b/chrome/test/data/load_all_blocked_plugins.html index 8ae05db..8ae05db 100644 --- a/chrome/test/data/npapi/load_all_blocked_plugins.html +++ b/chrome/test/data/load_all_blocked_plugins.html 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 |