Support a "policy" extension location in extension features files. At the same

extensions/common/manifest.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/common/manifest.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
@@ skipping 141 matching lines @@
       manifest_feature_provider->GetAllFeatureNames();
   for (std::vector<std::string>::const_iterator feature_name =
            feature_names.begin();
        feature_name != feature_names.end(); ++feature_name) {
     // Use Get instead of HasKey because the former uses path expansion.
     if (!value_->Get(*feature_name, NULL))
       continue;
 
     Feature* feature = manifest_feature_provider->GetFeature(*feature_name);
     Feature::Availability result = feature->IsAvailableToManifest(
-        extension_id_, type_, Feature::ConvertLocation(location_),
-        GetManifestVersion());
+        extension_id_, type_, location_, GetManifestVersion());
     if (!result.is_available())
       warnings->push_back(InstallWarning(result.message(), *feature_name));
   }
 
   // Also generate warnings for keys that are not features.
   for (base::DictionaryValue::Iterator it(*value_); !it.IsAtEnd();
        it.Advance()) {
     if (!manifest_feature_provider->GetFeature(it.key())) {
       warnings->push_back(InstallWarning(
           ErrorUtils::FormatErrorMessage(
@@ skipping 79 matching lines @@
   }
   return true;
 }
 
 bool Manifest::CanAccessKey(const std::string& key) const {
   Feature* feature = FeatureProvider::GetManifestFeatures()->GetFeature(key);
   if (!feature)
     return true;
 
   return feature->IsAvailableToManifest(
-      extension_id_, type_, Feature::ConvertLocation(location_),
-      GetManifestVersion()).is_available();
+                      extension_id_, type_, location_, GetManifestVersion())
+      .is_available();
 }
 
 }  // namespace extensions