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

extensions/common/permissions/permissions_data.cc

 // Copyright (c) 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/permissions/permissions_data.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 116 matching lines @@
 
     // The feature should exist since we just got an APIPermission for it. The
     // two systems should be updated together whenever a permission is added.
     DCHECK(feature) << "Could not find feature for " << iter->name();
     // http://crbug.com/176381
     if (!feature) {
       to_remove.push_back(iter->id());
       continue;
     }
 
-    Feature::Availability availability = feature->IsAvailableToManifest(
-        extension->id(),
-        extension->GetType(),
-        Feature::ConvertLocation(extension->location()),
-        extension->manifest_version());
+    Feature::Availability availability =
+        feature->IsAvailableToExtension(extension);
 
     if (!availability.is_available()) {
       // Don't fail, but warn the developer that the manifest contains
       // unrecognized permissions. This may happen legitimately if the
       // extensions requests platform- or channel-specific permissions.
       extension->AddInstallWarning(InstallWarning(availability.message(),
                                                   feature->name()));
       to_remove.push_back(iter->id());
       continue;
     }
@@ skipping 456 matching lines @@
       initial_optional_permissions_->api_permissions,
       initial_optional_permissions_->manifest_permissions,
       initial_optional_permissions_->host_permissions,
       URLPatternSet());
 
   initial_required_permissions_.reset();
   initial_optional_permissions_.reset();
 }
 
 }  // namespace extensions