[Hotword] Making enabling/disabling the setting enable/disable the hotword extension.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index a74de002987077876c71a5b99854424acaa926b9..f25c28b633ac2e80f2145bf414af51c4e8b11346 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1068,13 +1068,15 @@ void ExtensionService::DisableUserExtensions(
   const ExtensionSet& enabled_set = registry_->enabled_extensions();
   for (ExtensionSet::const_iterator extension = enabled_set.begin();
       extension != enabled_set.end(); ++extension) {
-    if (management_policy->UserMayModifySettings(extension->get(), NULL))
+    if (management_policy->UserMayModifySettings(extension->get(), NULL) &&
+        extension->get()->location() != Manifest::EXTERNAL_COMPONENT)
       to_disable.push_back(*extension);
   }
   const ExtensionSet& terminated_set = registry_->terminated_extensions();
   for (ExtensionSet::const_iterator extension = terminated_set.begin();
       extension != terminated_set.end(); ++extension) {
-    if (management_policy->UserMayModifySettings(extension->get(), NULL))
+    if (management_policy->UserMayModifySettings(extension->get(), NULL) &&
+        extension->get()->location() != Manifest::EXTERNAL_COMPONENT)

[miket_OOO, 2014/03/17 20:10:51]

This is starting to look ugly. What about wrapping this test into a helper
method?

bool ShouldBeDisabled(const Extension* extension) {
  if (...conditions...)
    return true;
  else if (...future conditions that someone else might add...) {
    return true;
  }
  return false;
}

As-is, it's susceptible to copy-paste errors in the future. Also, with boolean
tests that grow large like this, it's not really clear what's going on.

Bonus points if you put the helper method somewhere that others are more likely
to find and use it for other purposes in the future.

[rpetterson, 2014/03/17 21:14:29]

Because this needs to be merged, I'd rather keep the change small at this point.
I've filed a bug (crbug.com/353266) to cover this and will clean up right after
this. Does that seem reasonable?

       to_disable.push_back(*extension);
   }