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

Unified Diff: chrome/browser/extensions/extension_special_storage_policy_unittest.cc

Issue 12089102: Make most code on mac compile with enable_web_intents=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ffff Created 7 years, 11 months 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
Index: chrome/browser/extensions/extension_special_storage_policy_unittest.cc
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index 4dd098a994a1d26cdb9a4f0a3ab456ad9fe06188..b6e7de89965aefd8a0ed570e292690000274ee44 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -27,8 +27,10 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
public:
virtual void SetUp() {
policy_ = new ExtensionSpecialStoragePolicy(NULL);
+#if defined(ENABLE_WEB_INTENTS)
extensions::ManifestHandler::Register(keys::kIntents,
new extensions::WebIntentsHandler);
+#endif
}
protected:
@@ -131,6 +133,7 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
return handler_app;
}
+#if defined(ENABLE_WEB_INTENTS)
scoped_refptr<Extension> CreateWebIntentViewApp() {
#if defined(OS_WIN)
FilePath path(FILE_PATH_LITERAL("c:\\bar"));
@@ -164,6 +167,7 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
EXPECT_TRUE(intent_app.get()) << error;
return intent_app;
}
+#endif
// Verifies that the set of extensions protecting |url| is *exactly* equal to
// |expected_extensions|. Pass in an empty set to verify that an origin is not
@@ -287,6 +291,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, OverlappingApps) {
}
TEST_F(ExtensionSpecialStoragePolicyTest, WebIntentViewApp) {
+#if defined(ENABLE_WEB_INTENTS)
scoped_refptr<Extension> intent_app(CreateWebIntentViewApp());
policy_->GrantRightsForExtension(intent_app);
@@ -294,6 +299,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, WebIntentViewApp) {
policy_->RevokeRightsForExtension(intent_app);
EXPECT_FALSE(policy_->IsFileHandler(intent_app->id()));
+#endif
}
TEST_F(ExtensionSpecialStoragePolicyTest, HasSessionOnlyOrigins) {
« no previous file with comments | « chrome/browser/extensions/extension_special_storage_policy.cc ('k') | chrome/browser/extensions/platform_app_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698