diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 20:03:30 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 20:03:30 +0000 |
| commit | 1712232b6e2beffa413af6d97cf63b30a3b6e7c7 (patch) | |
| tree | 7346e88a8fa9d4c8bfc6aa417de8b30c60763e5f /chrome/test | |
| parent | d938aed98c3e683586d37b6dcbb1b20d95eb771a (diff) | |
| download | chromium_src-1712232b6e2beffa413af6d97cf63b30a3b6e7c7.zip chromium_src-1712232b6e2beffa413af6d97cf63b30a3b6e7c7.tar.gz chromium_src-1712232b6e2beffa413af6d97cf63b30a3b6e7c7.tar.bz2 | |
Revert "Parse more user script info out of the manifest and expose"
This reverts commit fc3fd1062c06f803775c16d11f742d85d540e415.
Review URL: http://codereview.chromium.org/18681
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rwxr-xr-x | chrome/test/data/extensions/extension1/manifest | 12 | ||||
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 1 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/chrome/test/data/extensions/extension1/manifest b/chrome/test/data/extensions/extension1/manifest index a7b3d74..bfde176 100755 --- a/chrome/test/data/extensions/extension1/manifest +++ b/chrome/test/data/extensions/extension1/manifest @@ -4,14 +4,8 @@ "version": "1.0",
"name": "My extension 1",
"description": "The first extension that I made.",
- "user_scripts": [
- {
- "matches": ["http://*.google.com/*", "https://*.google.com/*"],
- "files": ["script1.js"]
- },
- {
- "matches": ["http://*.yahoo.com/*"],
- "files": ["script2.js"]
- }
+ "content_scripts": [
+ "script1.user.js",
+ "script2.user.js"
]
}
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 32ac31a..efe4442 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -134,6 +134,7 @@ input_files = ChromeFileList([ '$CHROME_DIR/browser/download/download_request_manager_unittest.cc', '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc', '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc', + '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc', '$CHROME_DIR/browser/extensions/extension_unittest.cc', '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc', '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc', diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 817c1c7..ad1b852 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -455,6 +455,10 @@ > </File> <File + RelativePath="..\..\browser\extensions\extension_protocols_unittest.cc" + > + </File> + <File RelativePath="..\..\browser\extensions\extension_unittest.cc" > </File> |