Revert 124228 - 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 124239)
+++ chrome/common/extensions/extension_manifests_unittest.cc	(working copy)
@@ -775,21 +775,17 @@
 }
 
 TEST_F(ExtensionManifestTest, WebIntents) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableWebIntents);
+  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));
 
-  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);
@@ -822,8 +818,6 @@
 }
 
 TEST_F(ExtensionManifestTest, WebIntentsWithMultipleMimeTypes) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableWebIntents);
-
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("intent_valid_multitype.json"));
   ASSERT_TRUE(extension.get() != NULL);