Add EXTERNAL_POLICY to list of possible extension locations

chrome/browser/extensions/admin_policy.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/admin_policy.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/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,
                           string16* error,
                           bool modifiable_value) {
   bool modifiable =
       extension->location() != extensions::Manifest::COMPONENT &&
-      extension->location() != extensions::Manifest::EXTERNAL_POLICY_DOWNLOAD;
+      !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,
         UTF8ToUTF16(extension->name()));
   }
   return !modifiable_value;
@@ skipping 23 matching lines @@
                  const base::ListValue* whitelist,
                  const base::DictionaryValue* forcelist,
                  const base::ListValue* allowed_types,
                  const Extension* extension,
                  string16* error) {
   // Component extensions are always allowed.
   if (extension->location() == Manifest::COMPONENT)
     return true;
 
   // Forced installed extensions cannot be overwritten manually.
-  if (extension->location() != Manifest::EXTERNAL_POLICY_DOWNLOAD &&
+  if (extension->location() != Manifest::EXTERNAL_POLICY &&
+      extension->location() != Manifest::EXTERNAL_POLICY_DOWNLOAD &&
       forcelist && forcelist->HasKey(extension->id())) {
     return ReturnLoadError(extension, error);
   }
 
   // Early exit for the common case of no policy restrictions.
   if ((!blacklist || blacklist->empty()) && (!allowed_types))
     return true;
 
   // Check whether the extension type is allowed.
   //
@@ skipping 36 matching lines @@
 bool UserMayModifySettings(const Extension* extension, string16* error) {
   return ManagementPolicyImpl(extension, error, true);
 }
 
 bool MustRemainEnabled(const Extension* extension, string16* error) {
   return ManagementPolicyImpl(extension, error, false);
 }
 
 }  // namespace admin_policy
 }  // namespace extensions