From 1712232b6e2beffa413af6d97cf63b30a3b6e7c7 Mon Sep 17 00:00:00 2001
From: "aa@chromium.org" <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 22 Jan 2009 20:03:30 +0000
Subject: 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
---
 chrome/test/data/extensions/extension1/manifest | 12 +++---------
 chrome/test/unit/unit_tests.scons               |  1 +
 chrome/test/unit/unittests.vcproj               |  4 ++++
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'chrome/test')

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>
-- 
cgit v1.1