summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-12 19:07:13 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-12 19:07:13 +0000
commit6ebbb044c2f64b4130817b12714db7e5c1d99a05 (patch)
tree09b0343ac42c0cd5b48c92b6d79936dbefcd567d /chrome/test
parenta9ae82e654b2c18c3a1b08d284892d3ebcce10b1 (diff)
downloadchromium_src-6ebbb044c2f64b4130817b12714db7e5c1d99a05.zip
chromium_src-6ebbb044c2f64b4130817b12714db7e5c1d99a05.tar.gz
chromium_src-6ebbb044c2f64b4130817b12714db7e5c1d99a05.tar.bz2
Revert 172399 - possible perf regression in extension_content_scripts*-first
> Reland 171072 - Delay determination of why a synced disabled extension was disabled. > > Also simplify handling of legacy disabled extensions. > > BUG=162062 > > > Review URL: https://chromiumcodereview.appspot.com/11511009 TBR=yoz@chromium.org Review URL: https://codereview.chromium.org/11558024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/permissions_increase/updates.xml6
-rw-r--r--chrome/test/data/extensions/permissions_increase/v1/manifest.json3
-rw-r--r--chrome/test/data/extensions/permissions_increase/v2/manifest.json1
-rw-r--r--chrome/test/data/extensions/permissions_increase/v3/manifest.json1
4 files changed, 1 insertions, 10 deletions
diff --git a/chrome/test/data/extensions/permissions_increase/updates.xml b/chrome/test/data/extensions/permissions_increase/updates.xml
deleted file mode 100644
index 6105c17..0000000
--- a/chrome/test/data/extensions/permissions_increase/updates.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
- <app appid='pgdpcfcocojkjfbgpiianjngphoopgmo'>
- <updatecheck codebase='http://localhost/autoupdate/v2.crx' version='2' />
- </app>
-</gupdate>
diff --git a/chrome/test/data/extensions/permissions_increase/v1/manifest.json b/chrome/test/data/extensions/permissions_increase/v1/manifest.json
index b88a4e1..279a0d1 100644
--- a/chrome/test/data/extensions/permissions_increase/v1/manifest.json
+++ b/chrome/test/data/extensions/permissions_increase/v1/manifest.json
@@ -1,6 +1,5 @@
{
"version": "1",
"name": "Permission Test",
- "background_page": "background.html",
- "update_url": "http://localhost/autoupdate/updates.xml"
+ "background_page": "background.html"
}
diff --git a/chrome/test/data/extensions/permissions_increase/v2/manifest.json b/chrome/test/data/extensions/permissions_increase/v2/manifest.json
index 6d59e06..e05a900 100644
--- a/chrome/test/data/extensions/permissions_increase/v2/manifest.json
+++ b/chrome/test/data/extensions/permissions_increase/v2/manifest.json
@@ -2,7 +2,6 @@
"version": "2",
"name": "Permission Test",
"background_page": "background.html",
- "update_url": "http://localhost/autoupdate/updates.xml",
"permissions": [
"tabs"
]
diff --git a/chrome/test/data/extensions/permissions_increase/v3/manifest.json b/chrome/test/data/extensions/permissions_increase/v3/manifest.json
index 6a84a37..6f55137 100644
--- a/chrome/test/data/extensions/permissions_increase/v3/manifest.json
+++ b/chrome/test/data/extensions/permissions_increase/v3/manifest.json
@@ -2,7 +2,6 @@
"version": "3",
"name": "Permission Test",
"background_page": "background.html",
- "update_url": "http://localhost/autoupdate/updates.xml",
"permissions": [
"tabs", "management"
]