diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 19:52:07 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 19:52:07 +0000 |
| commit | 9f3c853d2c154744e7240988b86f1b4b86a39244 (patch) | |
| tree | dbd050915d3a06d0b4f0fcc9cd1273ba557414e6 /chrome/browser/extensions/api/preference | |
| parent | 68476cbd621d10d779d2a316854841666f16de8f (diff) | |
| download | chromium_src-9f3c853d2c154744e7240988b86f1b4b86a39244.zip chromium_src-9f3c853d2c154744e7240988b86f1b4b86a39244.tar.gz chromium_src-9f3c853d2c154744e7240988b86f1b4b86a39244.tar.bz2 | |
Silently install blacklisted extensions from auto-install locations (sync,
policy, etc) into a blacklisted state, rather than not-silently not-installing
them. This new behaviour is correct from a sync perspective, and the old
behaviour is quite annoying.
BUG=257677
R=yoz@chromium.org,isherman@chromium.org
TBR=akalin@chromium.org,dimich@chromium.org,estade@chromium.org
Review URL: https://chromiumcodereview.appspot.com/20217002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/preference')
| -rw-r--r-- | chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc index 41e797c..8a69ab3 100644 --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc @@ -152,7 +152,9 @@ void ExtensionControlledPrefsTest::EnsureExtensionInstalled( extension4() }; for (size_t i = 0; i < kNumInstalledExtensions; ++i) { if (extension == extensions[i] && !installed_[i]) { - prefs()->OnExtensionInstalled(extension, Extension::ENABLED, + prefs()->OnExtensionInstalled(extension, + Extension::ENABLED, + Blacklist::NOT_BLACKLISTED, syncer::StringOrdinal()); installed_[i] = true; break; |