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

extensions/browser/admin_policy.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/admin_policy.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 bool ManagementPolicyImpl(const extensions::Extension* extension,
                           base::string16* error,
                           bool modifiable_value) {
   bool modifiable =
-      !extensions::Manifest::IsComponentLocation(extension->location()) &&
+      extension->location() != extensions::Manifest::COMPONENT &&

[miket_OOO, 2014/03/12 21:54:46]

Please add a comment indicating that this test implicitly treats COMPONENT and
EXTERNAL_COMPONENT differently. It's not at all apparent from a quick read by
someone who might have forgotten that there are now two kinds of COMPONENT
types.

[rpetterson, 2014/03/12 23:27:32]

Done.

       !extensions::Manifest::IsPolicyLocation(extension->location());
   // Some callers equate "no restriction" to true, others to false.
   if (modifiable)
     return modifiable_value;
 
   if (error) {
     *error = l10n_util::GetStringFUTF16(
         IDS_EXTENSION_CANT_MODIFY_POLICY_REQUIRED,
         base::UTF8ToUTF16(extension->name()));
   }
@@ skipping 83 matching lines @@
 bool UserMayModifySettings(const Extension* extension, base::string16* error) {
   return ManagementPolicyImpl(extension, error, true);
 }
 
 bool MustRemainEnabled(const Extension* extension, base::string16* error) {
   return ManagementPolicyImpl(extension, error, false);
 }
 
 }  // namespace admin_policy
 }  // namespace extensions