Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/api/common_extension_api_unittest.cc

Issue 2494653005: Support API aliases (Closed)
Patch Set: update docs Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/common/extensions/api/_features.md ('K') | « chrome/common/extensions/api/_features.md ('k') | chrome/test/data/extensions/extension_api_unittest/api_features.json » ('j') | extensions/common/extension_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/common_extension_api_unittest.cc
diff --git a/chrome/common/extensions/api/common_extension_api_unittest.cc b/chrome/common/extensions/api/common_extension_api_unittest.cc
index 9ee5f56ee40aa04468cc6811e4a75edcad594458..b06d18c8a1bfcbd12dedee23ea8342bd70b1a0d7 100644
--- a/chrome/common/extensions/api/common_extension_api_unittest.cc
+++ b/chrome/common/extensions/api/common_extension_api_unittest.cc
@@ -39,6 +39,8 @@ const char* const kTestFeatures[] = {
"test6", "test7", "parent1", "parent2", "parent3",
};
+const char* const kAliasTestApis[] = {"alias_api_source"};
+
const char* const kSessionTypeTestFeatures[] = {
"test1", "kiosk_only", "non_kiosk", "multiple_session_types"};
@@ -203,10 +205,8 @@ TEST(ExtensionAPITest, APIFeatures) {
bool expected = test_data[i].expect_is_available;
Feature::Availability availability =
- api.IsAvailable(test_data[i].api_full_name,
- NULL,
- test_data[i].context,
- test_data[i].url);
+ api.IsAvailable(test_data[i].api_full_name, NULL, test_data[i].context,
+ test_data[i].url, CheckAliasStatus::NOT_ALLOWED);
EXPECT_EQ(expected, availability.is_available())
<< base::StringPrintf("Test %d: Feature '%s' was %s: %s",
static_cast<int>(i),
@@ -216,6 +216,50 @@ TEST(ExtensionAPITest, APIFeatures) {
}
}
+TEST(ExtensionAPITest, APIFeaturesAlias) {
+ UnittestFeatureProvider api_feature_provider;
+
+ TestExtensionAPI api;
+ api.RegisterDependencyProvider("api", &api_feature_provider);
+ for (const auto& key : kAliasTestApis)
+ api.add_fake_schema(key);
+ ExtensionAPI::OverrideSharedInstanceForTest scope(&api);
+
+ ASSERT_FALSE(api.IsAvailable("alias_api_source", NULL,
Devlin 2016/11/17 01:11:15 nullptr in new code
tbarzic 2016/11/17 18:12:13 it's not really new, more of a product of git cl f
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ ASSERT_TRUE(api.IsAvailable("alias_api_source", NULL,
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::ALLOWED)
+ .is_available());
+ ASSERT_TRUE(api.IsAvailable("alias_api_source.bar", NULL,
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::ALLOWED)
+ .is_available());
+ ASSERT_FALSE(api.IsAvailable("alias_api_source.foo", NULL,
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::ALLOWED)
+ .is_available());
+
+ scoped_refptr<const Extension> extension =
+ ExtensionBuilder()
+ .SetManifest(DictionaryBuilder()
+ .Set("name", "extension")
+ .Set("version", "1")
+ .Set("manifest_version", 2)
+ .Build())
+ .Build();
+ Feature* test_feature = api_feature_provider.GetFeature("alias_api_source");
+ ASSERT_TRUE(test_feature);
+ ASSERT_FALSE(api.IsAnyFeatureAvailableToContext(
+ *test_feature, extension.get(), Feature::UNBLESSED_EXTENSION_CONTEXT,
+ GURL(), CheckAliasStatus::NOT_ALLOWED));
+ EXPECT_TRUE(api.IsAnyFeatureAvailableToContext(
+ *test_feature, extension.get(), Feature::UNBLESSED_EXTENSION_CONTEXT,
+ GURL(), CheckAliasStatus::ALLOWED));
+}
+
TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) {
scoped_refptr<const Extension> app =
ExtensionBuilder()
@@ -283,10 +327,9 @@ TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) {
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_feature,
- test_data[i].extension,
- test_data[i].context,
- test_data[i].url))
+ api.IsAnyFeatureAvailableToContext(
+ *test_feature, test_data[i].extension, test_data[i].context,
+ test_data[i].url, CheckAliasStatus::NOT_ALLOWED))
<< i;
}
}
@@ -319,7 +362,8 @@ TEST(ExtensionAPITest, SessionTypeFeature) {
ScopedCurrentFeatureSessionType(test.current_session_type));
EXPECT_EQ(test.expect_available,
api.IsAvailable(test.api_name, nullptr,
- Feature::BLESSED_EXTENSION_CONTEXT, GURL())
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
.is_available())
<< "Test case (" << test.api_name << ", "
<< static_cast<int>(test.current_session_type) << ").";
@@ -395,59 +439,45 @@ TEST(ExtensionAPITest, ExtensionWithUnprivilegedAPIs) {
// "storage" is completely unprivileged.
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("storage"),
- NULL,
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()));
+ *api_features.GetFeature("storage"), NULL,
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED));
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("storage"),
- NULL,
- Feature::UNBLESSED_EXTENSION_CONTEXT,
- GURL()));
+ *api_features.GetFeature("storage"), NULL,
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED));
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("storage"),
- NULL,
- Feature::CONTENT_SCRIPT_CONTEXT,
- GURL()));
+ *api_features.GetFeature("storage"), NULL,
+ Feature::CONTENT_SCRIPT_CONTEXT, GURL(), CheckAliasStatus::NOT_ALLOWED));
// "extension" is partially unprivileged.
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("extension"),
- NULL,
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()));
+ *api_features.GetFeature("extension"), NULL,
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED));
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("extension"),
- NULL,
- Feature::UNBLESSED_EXTENSION_CONTEXT,
- GURL()));
+ *api_features.GetFeature("extension"), NULL,
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED));
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("extension"),
- NULL,
- Feature::CONTENT_SCRIPT_CONTEXT,
- GURL()));
+ *api_features.GetFeature("extension"), NULL,
+ Feature::CONTENT_SCRIPT_CONTEXT, GURL(), CheckAliasStatus::NOT_ALLOWED));
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("extension.getURL"),
- NULL,
- Feature::CONTENT_SCRIPT_CONTEXT,
- GURL()));
+ *api_features.GetFeature("extension.getURL"), NULL,
+ Feature::CONTENT_SCRIPT_CONTEXT, GURL(), CheckAliasStatus::NOT_ALLOWED));
// "history" is entirely privileged.
EXPECT_TRUE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("history"),
- NULL,
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()));
+ *api_features.GetFeature("history"), NULL,
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED));
EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("history"),
- NULL,
- Feature::UNBLESSED_EXTENSION_CONTEXT,
- GURL()));
+ *api_features.GetFeature("history"), NULL,
+ Feature::UNBLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED));
EXPECT_FALSE(extension_api->IsAnyFeatureAvailableToContext(
- *api_features.GetFeature("history"),
- NULL,
- Feature::CONTENT_SCRIPT_CONTEXT,
- GURL()));
+ *api_features.GetFeature("history"), NULL,
+ Feature::CONTENT_SCRIPT_CONTEXT, GURL(), CheckAliasStatus::NOT_ALLOWED));
}
scoped_refptr<Extension> CreateHostedApp() {
@@ -504,26 +534,31 @@ TEST(ExtensionAPITest, HostedAppPermissions) {
ExtensionAPI::CreateWithDefaultConfiguration());
// "runtime" and "tabs" should not be available in hosted apps.
- EXPECT_FALSE(extension_api->IsAvailable("runtime",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_FALSE(extension_api->IsAvailable("runtime.id",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_FALSE(extension_api->IsAvailable("runtime.sendMessage",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_FALSE(extension_api->IsAvailable("runtime.sendNativeMessage",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_FALSE(extension_api->IsAvailable("tabs.create",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("runtime", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("runtime.id", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("runtime.sendMessage", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("runtime.sendNativeMessage", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("tabs.create", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
}
TEST(ExtensionAPITest, AppAndFriendsAvailability) {
@@ -538,21 +573,24 @@ TEST(ExtensionAPITest, AppAndFriendsAvailability) {
permissions.insert("app.window");
scoped_refptr<Extension> extension =
CreatePackagedAppWithPermissions(permissions);
- EXPECT_FALSE(extension_api->IsAvailable(
- "app",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL("http://foo.com")).is_available());
- EXPECT_TRUE(extension_api->IsAvailable(
- "app.runtime",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL("http://foo.com")).is_available());
- EXPECT_TRUE(extension_api->IsAvailable(
- "app.window",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL("http://foo.com")).is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("app", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT,
+ GURL("http://foo.com"),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_TRUE(extension_api
+ ->IsAvailable("app.runtime", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT,
+ GURL("http://foo.com"),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_TRUE(extension_api
+ ->IsAvailable("app.window", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT,
+ GURL("http://foo.com"),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
}
// Make sure chrome.app.runtime and chrome.app.window are not available to
// extensions, and chrome.app is.
@@ -560,21 +598,24 @@ TEST(ExtensionAPITest, AppAndFriendsAvailability) {
std::set<std::string> permissions;
scoped_refptr<Extension> extension =
CreateExtensionWithPermissions(permissions);
- EXPECT_TRUE(extension_api->IsAvailable(
- "app",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL("http://foo.com")).is_available());
- EXPECT_FALSE(extension_api->IsAvailable(
- "app.runtime",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL("http://foo.com")).is_available());
- EXPECT_FALSE(extension_api->IsAvailable(
- "app.window",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL("http://foo.com")).is_available());
+ EXPECT_TRUE(extension_api
+ ->IsAvailable("app", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT,
+ GURL("http://foo.com"),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("app.runtime", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT,
+ GURL("http://foo.com"),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("app.window", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT,
+ GURL("http://foo.com"),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
}
}
@@ -586,14 +627,14 @@ TEST(ExtensionAPITest, ExtensionWithDependencies) {
CreateExtensionWithPermission("ttsEngine");
std::unique_ptr<ExtensionAPI> api(
ExtensionAPI::CreateWithDefaultConfiguration());
- EXPECT_TRUE(api->IsAvailable("ttsEngine",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_FALSE(api->IsAvailable("tts",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
+ EXPECT_TRUE(api->IsAvailable("ttsEngine", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(api->IsAvailable("tts", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
}
// Conversely, extension with the "tts" permission but not the "ttsEngine"
@@ -603,21 +644,23 @@ TEST(ExtensionAPITest, ExtensionWithDependencies) {
CreateExtensionWithPermission("tts");
std::unique_ptr<ExtensionAPI> api(
ExtensionAPI::CreateWithDefaultConfiguration());
- EXPECT_FALSE(api->IsAvailable("ttsEngine",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_TRUE(api->IsAvailable("tts",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
+ EXPECT_FALSE(api->IsAvailable("ttsEngine", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_TRUE(api->IsAvailable("tts", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
}
}
bool MatchesURL(
ExtensionAPI* api, const std::string& api_name, const std::string& url) {
- return api->IsAvailable(
- api_name, NULL, Feature::WEB_PAGE_CONTEXT, GURL(url)).is_available();
+ return api
+ ->IsAvailable(api_name, NULL, Feature::WEB_PAGE_CONTEXT, GURL(url),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available();
}
TEST(ExtensionAPITest, URLMatching) {
@@ -850,10 +893,11 @@ TEST(ExtensionAPITest, NoPermissions) {
for (size_t i = 0; i < arraysize(kTests); ++i) {
EXPECT_EQ(kTests[i].expect_success,
- extension_api->IsAvailable(kTests[i].permission_name,
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available())
+ extension_api
+ ->IsAvailable(kTests[i].permission_name, extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available())
<< "Permission being tested: " << kTests[i].permission_name;
}
}
@@ -871,14 +915,16 @@ TEST(ExtensionAPITest, ManifestKeys) {
.Build())
.Build();
- EXPECT_TRUE(extension_api->IsAvailable("browserAction",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
- EXPECT_FALSE(extension_api->IsAvailable("pageAction",
- extension.get(),
- Feature::BLESSED_EXTENSION_CONTEXT,
- GURL()).is_available());
+ EXPECT_TRUE(extension_api
+ ->IsAvailable("browserAction", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
+ EXPECT_FALSE(extension_api
+ ->IsAvailable("pageAction", extension.get(),
+ Feature::BLESSED_EXTENSION_CONTEXT, GURL(),
+ CheckAliasStatus::NOT_ALLOWED)
+ .is_available());
}
} // namespace extensions
« chrome/common/extensions/api/_features.md ('K') | « chrome/common/extensions/api/_features.md ('k') | chrome/test/data/extensions/extension_api_unittest/api_features.json » ('j') | extensions/common/extension_api.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698