diff options
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, 9 insertions, 8 deletions
diff --git a/chrome/test/data/extensions/extension1/manifest b/chrome/test/data/extensions/extension1/manifest index bfde176..a7b3d74 100755 --- a/chrome/test/data/extensions/extension1/manifest +++ b/chrome/test/data/extensions/extension1/manifest @@ -4,8 +4,14 @@ "version": "1.0",
"name": "My extension 1",
"description": "The first extension that I made.",
- "content_scripts": [
- "script1.user.js",
- "script2.user.js"
+ "user_scripts": [
+ {
+ "matches": ["http://*.google.com/*", "https://*.google.com/*"],
+ "files": ["script1.js"]
+ },
+ {
+ "matches": ["http://*.yahoo.com/*"],
+ "files": ["script2.js"]
+ }
]
}
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index efe4442..32ac31a 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -134,7 +134,6 @@ 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 ad1b852..817c1c7 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -455,10 +455,6 @@ > </File> <File - RelativePath="..\..\browser\extensions\extension_protocols_unittest.cc" - > - </File> - <File RelativePath="..\..\browser\extensions\extension_unittest.cc" > </File> |