Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2339)

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 11232060: Make sure sideload wipeout doesn't interfere with the tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_service.cc
===================================================================
--- chrome/browser/extensions/extension_service.cc (revision 163351)
+++ chrome/browser/extensions/extension_service.cc (working copy)
@@ -576,8 +576,10 @@
// The Sideload Wipeout effort takes place during load (see above), so once
// that is done the flag can be set so that we don't have to check again.
+#if defined(OS_WIN)
Aaron Boodman 2012/10/23 15:20:20 See other comment about OS_WIN ifdef.
if (FeatureSwitch::sideload_wipeout()->IsEnabled())
extension_prefs_->SetSideloadWipeoutDone();
+#endif
// If we are running in the import process, don't bother initializing the
// extension service since this can interfere with the main browser process
@@ -2184,6 +2186,13 @@
void ExtensionService::MaybeWipeout(
const extensions::Extension* extension) {
+#if !defined(OS_WIN)
Aaron Boodman 2012/10/23 15:20:20 Better to chokepoint this in the feature switch it
+ // We are targeting registry-installed extensions, which are Windows-specific,
+ // and extensions marked internal and not from the web store, which are mostly
+ // problematic on Windows.
+ return;
+#endif
+
if (!FeatureSwitch::sideload_wipeout()->IsEnabled())
return;

Powered by Google App Engine
This is Rietveld 408576698