Pass a Feature* to IsAnyFeatureAvailableToContext instead of a string name.

chrome/common/extensions/api/extension_api_unittest.cc

Index: chrome/common/extensions/api/extension_api_unittest.cc
diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc
index b706f13ceda8f8405b7d7bb3cf0087b93ac026b3..650662fd726e3e991a53d3eb8b5cee0f8b02e35e 100644
--- a/chrome/common/extensions/api/extension_api_unittest.cc
+++ b/chrome/common/extensions/api/extension_api_unittest.cc
@@ -316,11 +316,15 @@ TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) {
         api.RegisterSchemaResource(iter.key(), 0);
     }
 
+    Feature* test_feature =
+        api_feature_provider.GetFeature(test_data[i].api_full_name);
+    ASSERT_TRUE(test_feature);
     EXPECT_EQ(test_data[i].expect_is_available,
-              api.IsAnyFeatureAvailableToContext(test_data[i].api_full_name,
+              api.IsAnyFeatureAvailableToContext(*test_feature,
                                                  test_data[i].extension,
                                                  test_data[i].context,
-                                                 test_data[i].url)) << i;
+                                                 test_data[i].url))
+        << i;
   }
 }
 
@@ -390,77 +394,60 @@ TEST(ExtensionAPITest, ExtensionWithUnprivilegedAPIs) {
   scoped_ptr<ExtensionAPI> extension_api(
       ExtensionAPI::CreateWithDefaultConfiguration());
 
-  // "runtime" has privileged parts that should not be accessed by content
-  // scripts.
-  EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
-      "runtime.getBackgroundPage",

[not at google - send to devlin, 2013/12/18 01:55:14]

what happened to these?

[Jeffrey Yasskin, 2013/12/18 02:14:59]

runtime.getBackgroundPage isn't a feature, so it was exercising the logic in
IsAvailable that looks for subfeatures using concatenation, but looks for the
current feature by chaining up to the parent. This doesn't make a whole lot of
sense, so I didn't bother to keep it working when I switched the production code
to use Feature& everywhere. The fact that the production code *could* use
Feature& everywhere means this sort of edge case actually never happens, so we
don't need to test it. The rest of the "partially unprivileged" case is handled
by the "extension" test.

[not at google - send to devlin, 2013/12/18 02:18:10]

sgtm.

-      NULL,
-      Feature::CONTENT_SCRIPT_CONTEXT,
-      GURL()));
-  EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
-      "runtime.sendNativeMessage",
-      NULL,
-      Feature::CONTENT_SCRIPT_CONTEXT,
-      GURL()));
-  // "runtime" also has unprivileged parts.
-  EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "runtime.sendMessage",
-      NULL,
-      Feature::CONTENT_SCRIPT_CONTEXT,
-      GURL()));
-  EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "runtime.id",
-      NULL,
-      Feature::CONTENT_SCRIPT_CONTEXT,
-      GURL()));
+  const FeatureProvider& api_features = *FeatureProvider::GetAPIFeatures();
 
   // "storage" is completely unprivileged.
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "storage",
+      *api_features.GetFeature("storage"),
       NULL,
       Feature::BLESSED_EXTENSION_CONTEXT,
       GURL()));
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "storage",
+      *api_features.GetFeature("storage"),
       NULL,
       Feature::UNBLESSED_EXTENSION_CONTEXT,
       GURL()));
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "storage",
+      *api_features.GetFeature("storage"),
       NULL,
       Feature::CONTENT_SCRIPT_CONTEXT,
       GURL()));
 
   // "extension" is partially unprivileged.
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "extension",
+      *api_features.GetFeature("extension"),
       NULL,
       Feature::BLESSED_EXTENSION_CONTEXT,
       GURL()));
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "extension",
+      *api_features.GetFeature("extension"),
       NULL,
       Feature::UNBLESSED_EXTENSION_CONTEXT,
       GURL()));
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "extension",
+      *api_features.GetFeature("extension"),
+      NULL,
+      Feature::CONTENT_SCRIPT_CONTEXT,
+      GURL()));
+  EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
+      *api_features.GetFeature("extension.getURL"),
       NULL,
       Feature::CONTENT_SCRIPT_CONTEXT,
       GURL()));
 
   // "history" is entirely privileged.
   EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
-      "history",
+      *api_features.GetFeature("history"),
       NULL,
       Feature::BLESSED_EXTENSION_CONTEXT,
       GURL()));
   EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
-      "history",
+      *api_features.GetFeature("history"),
       NULL,
       Feature::UNBLESSED_EXTENSION_CONTEXT,
       GURL()));
   EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
-      "history",
+      *api_features.GetFeature("history"),
       NULL,
       Feature::CONTENT_SCRIPT_CONTEXT,
       GURL()));