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

chrome/common/extensions/extension_manifests_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 757 matching lines @@
       LoadAndExpectSuccess("tts_engine_valid.json"));
 
   ASSERT_EQ(1u, extension->tts_voices().size());
   EXPECT_EQ("name", extension->tts_voices()[0].voice_name);
   EXPECT_EQ("en-US", extension->tts_voices()[0].lang);
   EXPECT_EQ("female", extension->tts_voices()[0].gender);
   EXPECT_EQ(3U, extension->tts_voices()[0].event_types.size());
 }
 
 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);
 
   ASSERT_EQ(1u, extension->intents_services().size());
   EXPECT_EQ("image/png", UTF16ToUTF8(extension->intents_services()[0].type));
   EXPECT_EQ("http://webintents.org/share",
             UTF16ToUTF8(extension->intents_services()[0].action));
   EXPECT_EQ("chrome-extension",
@@ skipping 13 matching lines @@
   EXPECT_EQ("*", UTF16ToUTF8(extension->intents_services()[0].type));
   EXPECT_EQ("http://webintents.org/share",
             UTF16ToUTF8(extension->intents_services()[0].action));
   EXPECT_TRUE(extension->intents_services()[0].service_url.is_empty());
   EXPECT_EQ("", UTF16ToUTF8(extension->intents_services()[0].title));
   EXPECT_EQ(webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW,
             extension->intents_services()[0].disposition);
 }
 
 TEST_F(ExtensionManifestTest, WebIntentsWithMultipleMimeTypes) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableWebIntents);
+
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("intent_valid_multitype.json"));
   ASSERT_TRUE(extension.get() != NULL);
 
   ASSERT_EQ(2u, extension->intents_services().size());
 
   // One registration with multiple types generates a separate service for
   // each MIME type.
   for (int i = 0; i < 2; ++i) {
     EXPECT_EQ("http://webintents.org/share",
@@ skipping 247 matching lines @@
   EXPECT_EQ("", extension->page_action()->id());
   EXPECT_EQ(0u, extension->page_action()->icon_paths()->size());
   EXPECT_EQ("", extension->page_action()->GetTitle(
       ExtensionAction::kDefaultTabId));
   EXPECT_FALSE(extension->page_action()->HasPopup(
       ExtensionAction::kDefaultTabId));
 
   LoadAndExpectError("page_action_manifest_version_2b.json",
                      errors::kInvalidPageActionPopup);
 }