Refactored ExtensionsPrefs to store paths relative to the extensions install directory. Fix & reenabled two extensions_service unit_tests.

R=erikkay
BUG=14714

Review URL: http://codereview.chromium.org/140018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19285 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 49 insertions, 2 deletions

diff --git a/chrome/test/data/extensions/bad/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1/manifest.json b/chrome/test/data/extensions/bad/Extensions/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1/manifest.json
index 0eb81fa..0eb81fa 100644
--- a/chrome/test/data/extensions/bad/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1/manifest.json
+++ b/chrome/test/data/extensions/bad/Extensions/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1/manifest.json
diff --git a/chrome/test/data/extensions/bad/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Current Version b/chrome/test/data/extensions/bad/Extensions/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Current Version
index d00491f..d00491f 100644
--- a/chrome/test/data/extensions/bad/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Current Version
+++ b/chrome/test/data/extensions/bad/Extensions/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Current Version
diff --git a/chrome/test/data/extensions/bad/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1/not_a_manifest b/chrome/test/data/extensions/bad/Extensions/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1/not_a_manifest
index 3aac2d6..3aac2d6 100644
--- a/chrome/test/data/extensions/bad/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1/not_a_manifest
+++ b/chrome/test/data/extensions/bad/Extensions/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1/not_a_manifest
diff --git a/chrome/test/data/extensions/bad/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/Current Version b/chrome/test/data/extensions/bad/Extensions/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/Current Version
index d00491f..d00491f 100644
--- a/chrome/test/data/extensions/bad/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/Current Version
+++ b/chrome/test/data/extensions/bad/Extensions/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/Current Version
diff --git a/chrome/test/data/extensions/bad/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json b/chrome/test/data/extensions/bad/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
index 8706e1f..8706e1f 100644
--- a/chrome/test/data/extensions/bad/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
+++ b/chrome/test/data/extensions/bad/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
diff --git a/chrome/test/data/extensions/bad/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version b/chrome/test/data/extensions/bad/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version
index d3827e7..d3827e7 100644
--- a/chrome/test/data/extensions/bad/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version
+++ b/chrome/test/data/extensions/bad/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version
diff --git a/chrome/test/data/extensions/bad/cccccccccccccccccccccccccccccccc/git_abhors_empty_dirs b/chrome/test/data/extensions/bad/Extensions/cccccccccccccccccccccccccccccccc/git_abhors_empty_dirs
index f1adef6..f1adef6 100644
--- a/chrome/test/data/extensions/bad/cccccccccccccccccccccccccccccccc/git_abhors_empty_dirs
+++ b/chrome/test/data/extensions/bad/Extensions/cccccccccccccccccccccccccccccccc/git_abhors_empty_dirs
diff --git a/chrome/test/data/extensions/bad/Preferences b/chrome/test/data/extensions/bad/Preferences
new file mode 100755
index 0000000..e5eb8ac
--- /dev/null
+++ b/chrome/test/data/extensions/bad/Preferences
@@ -0,0 +1,26 @@
+{

+   "extensions": {

+      "settings": {

+         "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": {

+            "location": 1,

+            "path": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1",

+            "state": 1

+         },

+         "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": {

+            "location": 1,

+            "path": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1",

+            "state": 1

+         },

+         "bjafgdebaacbbbecmhlhpofkepfkgcpa": {

+            "location": 1,

+            "path": "bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0",

+            "state": 1

+         },

+            "cccccccccccccccccccccccccccccccc": {

+            "location": 1,

+            "path": "cccccccccccccccccccccccccccccccc/1.0",

+            "state": 1

+         }

+      }

+   }

+}

diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/js_files/script3.js b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/js_files/script3.js
index a149c12..a149c12 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/js_files/script3.js
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/js_files/script3.js
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
index 544b6b6..544b6b6 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script1.js b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script1.js
index 3a7479e..3a7479e 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script1.js
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script1.js
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script2.js b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script2.js
index 4ffd7b9..4ffd7b9 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script2.js
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script2.js
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style1.css b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style1.css
index 2676c97..2676c97 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style1.css
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style1.css
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style2.css b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style2.css
index c851a8f..c851a8f 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style2.css
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/style2.css
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
index d36de21..d36de21 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html
index 23a2edf..23a2edf 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html
diff --git a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/Current Version b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/Current Version
index 1921233..1921233 100644
--- a/chrome/test/data/extensions/good/behllobkkfkfnphdnhnkndlbkcpglgmj/Current Version
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/Current Version
diff --git a/chrome/test/data/extensions/good/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
index a7d4e32..a7d4e32 100644
--- a/chrome/test/data/extensions/good/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
+++ b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
diff --git a/chrome/test/data/extensions/good/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version
index d3827e7..d3827e7 100644
--- a/chrome/test/data/extensions/good/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version
+++ b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/Current Version
diff --git a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/background.html b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/background.html
index 741876f..741876f 100644
--- a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/background.html
+++ b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/background.html
diff --git a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/content_plugin.dll b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/content_plugin.dll
index e69de29..e69de29 100644
--- a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/content_plugin.dll
+++ b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/content_plugin.dll
diff --git a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/extension_plugin.dll b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/extension_plugin.dll
index e69de29..e69de29 100644
--- a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/extension_plugin.dll
+++ b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/extension_plugin.dll
diff --git a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json
index 39cd652..c6da352 100644
--- a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json
+++ b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/2/manifest.json
@@ -5,6 +5,6 @@
   "plugins": [
     { "path": "content_plugin.dll", "public": true },
     { "path": "extension_plugin.dll" }
-  ],
-  "background_page": "background.html"
+  ]
+  /* "background_page": "background.html" */
 }
diff --git a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/Current Version b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/Current Version
index 0cfbf08..0cfbf08 100644
--- a/chrome/test/data/extensions/good/hpiknbiabeeppbpihjehijgoemciehgk/Current Version
+++ b/chrome/test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/Current Version
diff --git a/chrome/test/data/extensions/good/Preferences b/chrome/test/data/extensions/good/Preferences
new file mode 100755
index 0000000..b0c0012
--- /dev/null
+++ b/chrome/test/data/extensions/good/Preferences
@@ -0,0 +1,21 @@
+{

+   "extensions": {

+      "settings": {

+         "behllobkkfkfnphdnhnkndlbkcpglgmj": {

+            "location": 1,

+            "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0",

+            "state": 1

+         },

+         "bjafgdebaacbbbecmhlhpofkepfkgcpa": {

+            "location": 1,

+            "path": "bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0",

+            "state": 1

+         },

+         "hpiknbiabeeppbpihjehijgoemciehgk": {

+            "location": 1,

+            "path": "hpiknbiabeeppbpihjehijgoemciehgk/2",

+            "state": 1

+         }

+      }

+   }

+}