diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 20:48:59 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 20:48:59 +0000 |
| commit | eab9b45f79f18963793e0f4d666a83b311caabd3 (patch) | |
| tree | 8ba9b44119deb7652f55838e494664cf395ae94c /chrome/test | |
| parent | 3418ebed0b079864abd37cf3d6d622ef4aa3b42c (diff) | |
| download | chromium_src-eab9b45f79f18963793e0f4d666a83b311caabd3.zip chromium_src-eab9b45f79f18963793e0f4d666a83b311caabd3.tar.gz chromium_src-eab9b45f79f18963793e0f4d666a83b311caabd3.tar.bz2 | |
Try again to commit r8486, which updates the manifest
parsing in the Extension class to also parse out user
script details.
The problem was that extension_protocols.cc appears to
link OK if you don't refer to anything in it, but as
soon as you try to use something defined in it, a bunch
of other symbols it refers to turn up undefined.
To avoid this problem in the future, I stopped compiling
extensions_protocol.cc so that we would realize if we
tried to use it.
Also in this change, I absolutified paths in
ExtensionsService before creating Extension instances.
On Linux, the path that PathService was giving us was
not absolute.
Review URL: http://codereview.chromium.org/18704
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8576 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, 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 1cfae9f..21763ce 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> |