Revert "Parse more user script info out of the manifest and expose"

chrome/test/data/extensions/extension1/manifest

Index: chrome/test/data/extensions/extension1/manifest
diff --git a/chrome/test/data/extensions/extension1/manifest b/chrome/test/data/extensions/extension1/manifest
index a7b3d74fdc72168e001d9a4ae80a53c47c3e61bc..bfde17678264bcd858e305a217a380d9df811849 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"
   ]
 }