Add extensions content scripts to page cycler tests.

This includes two things:

-A profile containing 10 different extensions, each with 1 content script.
 (We already had one with 1 extension).

-Changes to page_cycler_tests.cc to add versions of MozFile and MorejsFile 
 run with 1 and 10 extensions having a content script. (Only the 1-extension
 case will be run by default on the buildbots).

BUG=14037
TEST=none


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

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

22 files changed, 375 insertions, 87 deletions

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json
new file mode 100644
index 0000000..ebb23bbd
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test10",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJc5hNAjdKE1Rf/xYR7qkCRqoHDqZ69XRNh0NkYvir4XGlE7uqg7x2EhilkXqeoEmGJdqBYH601CgfRK0bmDbF+zlGvgW20ld4pmhWlBjZBi7ZoqLRK4UkBC7EFnIdxVHb+rQtEYK+1nTzX6WKMaNtPKjs2oTRMchZdpDyLRhmaQIDAQAB",

+   "name": "test10",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json
new file mode 100644
index 0000000..a325a89
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test1",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbg9bDLfP2MkNebiYmIIrmP8TKyGR/a1Ul26PYbj/6UCvUN5aVZfZKKH8S7FEp3vCunIOF8h+JPugcMmJRTOhylqEjIAJBWI6CgljgS1CfGnHraeixrfRL6odFKqTc+cQr/TwlCGpK5qjtczX4LsJGRmxKA6upm+B81m8AiAUMJQIDAQAB",

+   "name": "test1",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json
new file mode 100644
index 0000000..80ba6292
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test7",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9D6Byfx1I8upJ+M2KXJZU6Evgm3VgvFFfmxJI65i5glm/trQujqBPU+BxiD4OZPX23Fas4wLsDkc0zN/NV04irgeVKlbslg5giojeWzJgenmLvpcw5CDP+tTgIpWV207nuVpqG2kdrP2zx8vgaSUuVUdIUF5mrbdHkYjnXkFzXwIDAQAB",

+   "name": "test7",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json
new file mode 100644
index 0000000..25293e9
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test9",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2t6hjZyu4jS8UIHLxJMZoxAWDULi7PGC8pmA9LLe9NiDWG5UB68Se7olodYE/4fvuEc4r7JM1guz3r8FDvgZ+djxMXsldY5A683PxNpGEJf1bZfqDb2xUX4LlKgcNFcwMZpAza2BPZu+OlcIX/n9XodgP4+e55A3IxeuMIs5uKQIDAQAB",

+   "name": "test9",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json
new file mode 100644
index 0000000..8e18a65
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test4",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8VBNzk/hJkrU1xOU5c7JLJfMs379GV2bl7IqnbeofUNUCWjRhi65bX/snHCdnRam1leS2dXESiBAW2+hP7BsIeQvlIM+TVUNOJrVtIhOl7QSQh1WlI00lif5nM9hi2F4sLmGpCpI83WkJjUuuoY+0U9XTJkInY2JU8WTZvEXpeQIDAQAB",

+   "name": "test4",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json
new file mode 100644
index 0000000..7bfe9d3
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test3",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVvOzMOzU9zxnpj+nQUcWVdW76rYlfVaDWYmOgoNrXN2C1WsB6GE+nxsjGgA3t2AP5M9Vwq9b3CCI5CCHEzWaZGGQ7qrSidU2gosNUb8n7O3K95BnqMOdrIlnN2/Z5POdfjGRN2BNpSdQ8UVjD8wZPJ7E7JIFdizGz70TV6lMNyQIDAQAB",

+   "name": "test3",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json
new file mode 100644
index 0000000..f6b40f0
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test2",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nUfTHAG9rZ14Vq+JCUCU6OxuCkQ+Q6s6RA2h+mnJL8op4IBdOqZN038lmsl2rFhKz1rP/YPS4AP/LyiTfqL8e12GLw4nm71AM/LqeATzfFrvcFYCXy75ewhmBoOHMGQNe8JfaZ+0baUP7DnUiag91GiRmuAbqQGxLhdU6Qp3+wIDAQAB",

+   "name": "test2",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json
new file mode 100644
index 0000000..c5e5e16
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test8",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuuuaBElvU9XfeQLZ+w7YijIjQ/UOtUCzPApLZ1jurBC2BtTKVffL/ZzBEjGeYJZGqrbYeXxoIuM++UlWTGwxeOhGyO3zE0qgqlx9C8ufgaFAXY+fnLXnsrN18UupRGesuvmBEfvI0Lgp0fMKgAFBd5AEwdsrTLqkNK0pkGelEHwIDAQAB",

+   "name": "test8",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json
new file mode 100644
index 0000000..da1f2ee
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test5",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEII3rgPbgU4VEmHo4aKRVVujGhBqg2vhKXqtWnS7Yw5OJWkzFFa/Yb9Tz3/3m6HIh7cVCPP8RG4Ssro6JEDPHCwJU8ILMcgZkKtzOOFt2bybQBmVc1cTEOkSIfS9ktQPANi7ljxOqqDelyB6uwhGe4VZ324f/e4TISMBA+ejgkwIDAQAB",

+   "name": "test5",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json
new file mode 100644
index 0000000..a284020
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json
@@ -0,0 +1,10 @@
+{

+   "content_scripts": [ {

+      "js": [ "script.js" ],

+      "matches": [ "file://*", "http://*/*" ]

+   } ],

+   "description": "test6",

+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH/GGfuKiHDPMppIwuuRndAchnsz2iH6up9e5s+W6gsHtus37rkUvbUnCkx+ThE5F4Fj/C/rMYwGgCLe30HowD5BocOM0PF50aeYotlH4uystL2Gj/U1oSuBt+Mqn/MuR9U8nQnFvcDQeyG/09iPwC2faj7/LNnu0rT+dtYk0GnQIDAQAB",

+   "name": "test6",

+   "version": "1.0"

+}

diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/script.js b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/script.js
new file mode 100644
index 0000000..8ad5edc
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/script.js
@@ -0,0 +1,4 @@
+
+var a = 1;
+var b = 2;
+var c = 3;
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Preferences b/chrome/test/data/extensions/profiles/content_scripts10/Default/Preferences
new file mode 100644
index 0000000..2bb386f
--- /dev/null
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Preferences
@@ -0,0 +1,172 @@
+{

+   "download": {

+      "directory_upgrade": true,

+      "extensions_to_open": ""

+   },

+   "extensions": {

+      "autoupdate": {

+         "next_check": "12898308340840420"

+      },

+      "settings": {

+         "ahbojlbmpfcbogfblmekncilheldhjga": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test10",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJc5hNAjdKE1Rf/xYR7qkCRqoHDqZ69XRNh0NkYvir4XGlE7uqg7x2EhilkXqeoEmGJdqBYH601CgfRK0bmDbF+zlGvgW20ld4pmhWlBjZBi7ZoqLRK4UkBC7EFnIdxVHb+rQtEYK+1nTzX6WKMaNtPKjs2oTRMchZdpDyLRhmaQIDAQAB",

+               "name": "test10",

+               "version": "1.0"

+            },

+            "path": "ahbojlbmpfcbogfblmekncilheldhjga\\1.0",

+            "state": 1

+         },

+         "coomonpcecmahbfkifeohkbgicpcfdgf": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test1",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbg9bDLfP2MkNebiYmIIrmP8TKyGR/a1Ul26PYbj/6UCvUN5aVZfZKKH8S7FEp3vCunIOF8h+JPugcMmJRTOhylqEjIAJBWI6CgljgS1CfGnHraeixrfRL6odFKqTc+cQr/TwlCGpK5qjtczX4LsJGRmxKA6upm+B81m8AiAUMJQIDAQAB",

+               "name": "test1",

+               "version": "1.0"

+            },

+            "path": "coomonpcecmahbfkifeohkbgicpcfdgf\\1.0",

+            "state": 1

+         },

+         "dhminefdpfgdedodgdilagiencggdcpm": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test7",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9D6Byfx1I8upJ+M2KXJZU6Evgm3VgvFFfmxJI65i5glm/trQujqBPU+BxiD4OZPX23Fas4wLsDkc0zN/NV04irgeVKlbslg5giojeWzJgenmLvpcw5CDP+tTgIpWV207nuVpqG2kdrP2zx8vgaSUuVUdIUF5mrbdHkYjnXkFzXwIDAQAB",

+               "name": "test7",

+               "version": "1.0"

+            },

+            "path": "dhminefdpfgdedodgdilagiencggdcpm\\1.0",

+            "state": 1

+         },

+         "kgfhjcinicjnlcbnbacbkbjdbafnlckn": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test9",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2t6hjZyu4jS8UIHLxJMZoxAWDULi7PGC8pmA9LLe9NiDWG5UB68Se7olodYE/4fvuEc4r7JM1guz3r8FDvgZ+djxMXsldY5A683PxNpGEJf1bZfqDb2xUX4LlKgcNFcwMZpAza2BPZu+OlcIX/n9XodgP4+e55A3IxeuMIs5uKQIDAQAB",

+               "name": "test9",

+               "version": "1.0"

+            },

+            "path": "kgfhjcinicjnlcbnbacbkbjdbafnlckn\\1.0",

+            "state": 1

+         },

+         "ledhkldokbafdcbmepdigjmkabmombel": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test4",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8VBNzk/hJkrU1xOU5c7JLJfMs379GV2bl7IqnbeofUNUCWjRhi65bX/snHCdnRam1leS2dXESiBAW2+hP7BsIeQvlIM+TVUNOJrVtIhOl7QSQh1WlI00lif5nM9hi2F4sLmGpCpI83WkJjUuuoY+0U9XTJkInY2JU8WTZvEXpeQIDAQAB",

+               "name": "test4",

+               "version": "1.0"

+            },

+            "path": "ledhkldokbafdcbmepdigjmkabmombel\\1.0",

+            "state": 1

+         },

+         "lgmapeiimomfdbfphldobhhpoaoafaci": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test3",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVvOzMOzU9zxnpj+nQUcWVdW76rYlfVaDWYmOgoNrXN2C1WsB6GE+nxsjGgA3t2AP5M9Vwq9b3CCI5CCHEzWaZGGQ7qrSidU2gosNUb8n7O3K95BnqMOdrIlnN2/Z5POdfjGRN2BNpSdQ8UVjD8wZPJ7E7JIFdizGz70TV6lMNyQIDAQAB",

+               "name": "test3",

+               "version": "1.0"

+            },

+            "path": "lgmapeiimomfdbfphldobhhpoaoafaci\\1.0",

+            "state": 1

+         },

+         "maemolkcfjifpmigoecmpfphmebnebpk": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test2",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nUfTHAG9rZ14Vq+JCUCU6OxuCkQ+Q6s6RA2h+mnJL8op4IBdOqZN038lmsl2rFhKz1rP/YPS4AP/LyiTfqL8e12GLw4nm71AM/LqeATzfFrvcFYCXy75ewhmBoOHMGQNe8JfaZ+0baUP7DnUiag91GiRmuAbqQGxLhdU6Qp3+wIDAQAB",

+               "name": "test2",

+               "version": "1.0"

+            },

+            "path": "maemolkcfjifpmigoecmpfphmebnebpk\\1.0",

+            "state": 1

+         },

+         "mdeggakgacjccnbfbhbihfchoidihkaf": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test8",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuuuaBElvU9XfeQLZ+w7YijIjQ/UOtUCzPApLZ1jurBC2BtTKVffL/ZzBEjGeYJZGqrbYeXxoIuM++UlWTGwxeOhGyO3zE0qgqlx9C8ufgaFAXY+fnLXnsrN18UupRGesuvmBEfvI0Lgp0fMKgAFBd5AEwdsrTLqkNK0pkGelEHwIDAQAB",

+               "name": "test8",

+               "version": "1.0"

+            },

+            "path": "mdeggakgacjccnbfbhbihfchoidihkaf\\1.0",

+            "state": 1

+         },

+         "mgonfebmjopdoipblbijejncibmgmcol": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test5",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEII3rgPbgU4VEmHo4aKRVVujGhBqg2vhKXqtWnS7Yw5OJWkzFFa/Yb9Tz3/3m6HIh7cVCPP8RG4Ssro6JEDPHCwJU8ILMcgZkKtzOOFt2bybQBmVc1cTEOkSIfS9ktQPANi7ljxOqqDelyB6uwhGe4VZ324f/e4TISMBA+ejgkwIDAQAB",

+               "name": "test5",

+               "version": "1.0"

+            },

+            "path": "mgonfebmjopdoipblbijejncibmgmcol\\1.0",

+            "state": 1

+         },

+         "ohmmlgjlmaadhojogadklhlidfpdeoca": {

+            "location": 1,

+            "manifest": {

+               "content_scripts": [ {

+                  "js": [ "script.js" ],

+                  "matches": [ "file://*", "http://*/*" ]

+               } ],

+               "description": "test6",

+               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH/GGfuKiHDPMppIwuuRndAchnsz2iH6up9e5s+W6gsHtus37rkUvbUnCkx+ThE5F4Fj/C/rMYwGgCLe30HowD5BocOM0PF50aeYotlH4uystL2Gj/U1oSuBt+Mqn/MuR9U8nQnFvcDQeyG/09iPwC2faj7/LNnu0rT+dtYk0GnQIDAQAB",

+               "name": "test6",

+               "version": "1.0"

+            },

+            "path": "ohmmlgjlmaadhojogadklhlidfpdeoca\\1.0",

+            "state": 1

+         }

+      }

+   },

+   "profile": {

+      "exited_cleanly": true,

+      "id": "not-signed-in",

+      "name": "",

+      "nickname": ""

+   },

+   "session": {

+      "urls_to_restore_on_startup": [  ]

+   }

+}

diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 06d61de..d373550 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -177,7 +177,6 @@ class PageCyclerTest : public UITest {
   // For HTTP tests, the name must be safe for use in a URL without escaping.
   void RunPageCycler(const char* name, std::wstring* pages,
                      std::string* timings, bool use_http) {
-
     // Make sure the test data is checked out
     FilePath test_path;
     PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
@@ -373,27 +372,30 @@ class PageCyclerTest : public UITest {
     }
 
 #endif  // !defined(OS_MACOSX)
-
   }
 
   // When use_http is true, the test name passed here will be used directly in
   // the path to the test data, so it must be safe for use in a URL without
   // escaping. (No pound (#), question mark (?), semicolon (;), non-ASCII, or
   // other funny stuff.)
-  void RunTest(const char* name, bool use_http) {
+  void RunTestWithSuffix(const char* name, bool use_http, const char* suffix) {
     std::wstring pages;
     std::string timings;
     RunPageCycler(name, &pages, &timings, use_http);
     if (timings.empty())
       return;
 
-    PrintMemoryUsageInfo("");
-    PrintIOPerfInfo("");
-
+    PrintMemoryUsageInfo(suffix);
+    PrintIOPerfInfo(suffix);
+    std::string trace_name = "t" + std::string(suffix);
     wprintf(L"\nPages: [%ls]\n", pages.c_str());
-    PrintResultList("times", "", "t", timings, "ms",
+    PrintResultList("times", "", trace_name, timings, "ms",
                     true /* important */);
   }
+
+  void RunTest(const char* name, bool use_http) {
+    RunTestWithSuffix(name, use_http, "");
+  }
 };
 
 class PageCyclerReferenceTest : public PageCyclerTest {
@@ -434,94 +436,68 @@ class PageCyclerReferenceTest : public PageCyclerTest {
   }
 };
 
-// file-URL tests
-TEST_F(PageCyclerTest, MozFile) {
-  RunTest("moz", false);
-}
-
-TEST_F(PageCyclerReferenceTest, MozFile) {
-  RunTest("moz", false);
-}
-
-TEST_F(PageCyclerTest, Intl1File) {
-  RunTest("intl1", false);
-}
-
-TEST_F(PageCyclerReferenceTest, Intl1File) {
-  RunTest("intl1", false);
-}
-
-TEST_F(PageCyclerTest, Intl2File) {
-  RunTest("intl2", false);
-}
-
-TEST_F(PageCyclerReferenceTest, Intl2File) {
-  RunTest("intl2", false);
-}
-
-TEST_F(PageCyclerTest, DomFile) {
-  RunTest("dom", false);
-}
-
-TEST_F(PageCyclerReferenceTest, DomFile) {
-  RunTest("dom", false);
-}
+class PageCyclerExtensionTest : public PageCyclerTest {
+ public:
+  void SetUp() {}
+  void RunTest(const char* extension_profile, const char* output_suffix,
+               const char* name, bool use_http) {
+    // Set up the extension profile directory.
+    ASSERT_TRUE(extension_profile != NULL);
+    FilePath data_dir;
+    PathService::Get(chrome::DIR_TEST_DATA, &data_dir);
+    data_dir = data_dir.AppendASCII("extensions").AppendASCII("profiles").
+        AppendASCII(extension_profile);
+    ASSERT_TRUE(file_util::DirectoryExists(data_dir));
+    set_template_user_data(data_dir.ToWStringHack());
 
-TEST_F(PageCyclerTest, DhtmlFile) {
-  RunTest("dhtml", false);
-}
+    // Now run the test.
+    PageCyclerTest::SetUp();
+    PageCyclerTest::RunTestWithSuffix(name, use_http, output_suffix);
+  }
+};
 
-TEST_F(PageCyclerReferenceTest, DhtmlFile) {
-  RunTest("dhtml", false);
+// This macro simplifies setting up regular and reference build tests.
+#define PAGE_CYCLER_TESTS(test, name, use_http) \
+TEST_F(PageCyclerTest, name) { \
+  RunTest(test, use_http); \
+} \
+TEST_F(PageCyclerReferenceTest, name) { \
+  RunTest(test, use_http); \
 }
 
-TEST_F(PageCyclerTest, MorejsFile) {
-  RunTest("morejs", false);
+// These are shorthand for File vs. Http tests.
+#define PAGE_CYCLER_FILE_TESTS(test, name)\
+  PAGE_CYCLER_TESTS(test, name, false)
+#define PAGE_CYCLER_HTTP_TESTS(test, name)\
+  PAGE_CYCLER_TESTS(test, name, true)
+
+// This macro lets us define tests with 1 and 10 extensions with 1 content
+// script each. The name for the 10-extension case is changed so as not
+// to run by default on the buildbots.
+#define PAGE_CYCLER_EXTENSIONS_FILE_TESTS(test, name) \
+TEST_F(PageCyclerExtensionTest, name) {  \
+  RunTest("content_scripts1", "_extcs1", test, false); \
+} \
+TEST_F(PageCyclerExtensionTest, name##10) { \
+  RunTest("content_scripts10", "_extcs10", test, false); \
 }
 
-TEST_F(PageCyclerReferenceTest, MorejsFile) {
-  RunTest("morejs", false);
-}
+// file-URL tests
+PAGE_CYCLER_FILE_TESTS("moz", MozFile);
+PAGE_CYCLER_EXTENSIONS_FILE_TESTS("moz", MozFile);
+PAGE_CYCLER_FILE_TESTS("intl1", Intl1File);
+PAGE_CYCLER_FILE_TESTS("intl2", Intl2File);
+PAGE_CYCLER_FILE_TESTS("dom", DomFile);
+PAGE_CYCLER_FILE_TESTS("dhtml", DhtmlFile);
+PAGE_CYCLER_FILE_TESTS("morejs", MorejsFile);
+PAGE_CYCLER_EXTENSIONS_FILE_TESTS("morejs", MorejsFile);
 
 // http (localhost) tests
-TEST_F(PageCyclerTest, MozHttp) {
-  RunTest("moz", true);
-}
-
-TEST_F(PageCyclerReferenceTest, MozHttp) {
-  RunTest("moz", true);
-}
-
-TEST_F(PageCyclerTest, Intl1Http) {
-  RunTest("intl1", true);
-}
-
-TEST_F(PageCyclerReferenceTest, Intl1Http) {
-  RunTest("intl1", true);
-}
-
-TEST_F(PageCyclerTest, Intl2Http) {
-  RunTest("intl2", true);
-}
-
-TEST_F(PageCyclerReferenceTest, Intl2Http) {
-  RunTest("intl2", true);
-}
-
-TEST_F(PageCyclerTest, DomHttp) {
-  RunTest("dom", true);
-}
-
-TEST_F(PageCyclerReferenceTest, DomHttp) {
-  RunTest("dom", true);
-}
+PAGE_CYCLER_HTTP_TESTS("moz", MozHttp);
+PAGE_CYCLER_HTTP_TESTS("intl1", Intl1Http);
+PAGE_CYCLER_HTTP_TESTS("intl2", Intl2Http);
+PAGE_CYCLER_HTTP_TESTS("dom", DomHttp);
+PAGE_CYCLER_HTTP_TESTS("bloat", BloatHttp);
 
-TEST_F(PageCyclerTest, BloatHttp) {
-  RunTest("bloat", true);
-}
-
-TEST_F(PageCyclerReferenceTest, BloatHttp) {
-  RunTest("bloat", true);
-}
 
 }  // namespace