Revert 119423 - Revert 119306 - Turn web intents build flag on.

chrome/common/extensions/extension_manifests_unittest.cc

Index: chrome/common/extensions/extension_manifests_unittest.cc
===================================================================
--- chrome/common/extensions/extension_manifests_unittest.cc	(revision 124226)
+++ chrome/common/extensions/extension_manifests_unittest.cc	(working copy)
@@ -775,17 +775,21 @@
 }
 
 TEST_F(ExtensionManifestTest, WebIntents) {
-  Testcase testcases[] = {
-    {"intent_invalid_1.json", errors::kInvalidIntents},
-    {"intent_invalid_2.json", errors::kInvalidIntent},
-    {"intent_invalid_3.json", errors::kInvalidIntentPath},
-    {"intent_invalid_4.json", errors::kInvalidIntentDisposition},
-    {"intent_invalid_5.json", errors::kInvalidIntentType},
-    {"intent_invalid_6.json", errors::kInvalidIntentTitle},
-    {"intent_invalid_packaged_app.json", errors::kCannotAccessPage}
-  };
-  RunTestcases(testcases, arraysize(testcases));
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableWebIntents);
 
+  LoadAndExpectError("intent_invalid_1.json",
+                     extension_manifest_errors::kInvalidIntents);
+  LoadAndExpectError("intent_invalid_2.json",
+                     extension_manifest_errors::kInvalidIntent);
+  LoadAndExpectError("intent_invalid_3.json",
+                     extension_manifest_errors::kInvalidIntentPath);
+  LoadAndExpectError("intent_invalid_4.json",
+                     extension_manifest_errors::kInvalidIntentDisposition);
+  LoadAndExpectError("intent_invalid_5.json",
+                     extension_manifest_errors::kInvalidIntentType);
+  LoadAndExpectError("intent_invalid_6.json",
+                     extension_manifest_errors::kInvalidIntentTitle);
+
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("intent_valid.json"));
   ASSERT_TRUE(extension.get() != NULL);
@@ -818,6 +822,8 @@
 }
 
 TEST_F(ExtensionManifestTest, WebIntentsWithMultipleMimeTypes) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableWebIntents);
+
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("intent_valid_multitype.json"));
   ASSERT_TRUE(extension.get() != NULL);