Retry the sideload wipeout polish changelist.
This is the same changelist that was reviewed here:
http://codereview.chromium.org/11232060/
... with a few changes:
1) Moved the RemoveObserver call (in ToolbarView) that was messing up interactive tests to happen when we've received the message we are after.
2) Change the code to use UpdatesFromGallery in two places instead of from_webstore.
3) Added FeatureSwitch flag to ExtensionStartupTests, to avoid Sideload Wipeout from affecting the tests.
4) Added a unit test.
5) Make sure sideload-wipeout is disabled by default.
Description from previous changelist (copied unchanged):
Make sure sideload wipeout doesn't interfere with the tests.
Make sure it does not run on other platforms besides Windows, where it was intended (for now).
Fix the problem with bubble appearing to the right of the browser.
Make sure the bubble does not appear on next run after explicitly dismissing it.
BUG=154624
TEST=None
Review URL: https://codereview.chromium.org/11266007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164897 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 99778a1d..1f63237e 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2207,11 +2207,13 @@
if (done)
return;
+ Extension::Type type = extension->GetType();
int disable_reasons = extension_prefs_->GetDisableReasons(extension->id());
- if (disable_reasons == Extension::DISABLE_NONE) {
+ if (disable_reasons == Extension::DISABLE_NONE &&
+ type == Extension::TYPE_EXTENSION) {
Extension::Location location = extension->location();
if (location == Extension::EXTERNAL_REGISTRY ||
- (location == Extension::INTERNAL && !extension->from_webstore())) {
+ (location == Extension::INTERNAL && !extension->UpdatesFromGallery())) {
extension_prefs_->SetExtensionState(extension->id(), Extension::DISABLED);
extension_prefs_->AddDisableReason(
extension->id(),
