Reland r130462: Implement FeatureProvider for ExtensionAPI."

chrome/common/extensions/manifest.cc

Index: chrome/common/extensions/manifest.cc
diff --git a/chrome/common/extensions/manifest.cc b/chrome/common/extensions/manifest.cc
index 2449d443da9365d97d309b138869c42b51e1d7a7..aa4a4957c35266fd9d96c5e72e16547233bfa089 100644
--- a/chrome/common/extensions/manifest.cc
+++ b/chrome/common/extensions/manifest.cc
@@ -38,7 +38,7 @@ bool Manifest::ValidateManifest(string16* error) const {
       continue;
     }
 
-    Feature::Availability result = feature->IsAvailable(
+    Feature::Availability result = feature->IsAvailableToManifest(
         extension_id_, GetType(), Feature::ConvertLocation(location_),
         GetManifestVersion());
     if (result != Feature::IS_AVAILABLE) {
@@ -155,7 +155,7 @@ bool Manifest::CanAccessKey(const std::string& key) const {
   if (!feature.get())
     return false;
 
-  return Feature::IS_AVAILABLE == feature->IsAvailable(
+  return Feature::IS_AVAILABLE == feature->IsAvailableToManifest(
       extension_id_, GetType(), Feature::ConvertLocation(location_),
       GetManifestVersion());
 }