Web Intents: Remove the flag and compile-time define.

content/browser/intents/intent_injector.cc

Index: content/browser/intents/intent_injector.cc
diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc
index 1b44df180fda70770ebe32607723ab06d3445bec..a2818755d0ba0438da9f29bd9a5f75b1fa028998 100644
--- a/content/browser/intents/intent_injector.cc
+++ b/content/browser/intents/intent_injector.cc
@@ -66,12 +66,8 @@ void IntentInjector::OnSendReturnMessage(
 }
 
 void IntentInjector::RenderViewCreated(RenderViewHost* render_view_host) {
-  if (source_intent_.get() == NULL ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableWebIntents) ||
-      web_contents()->GetRenderViewHost() == NULL) {
+  if (source_intent_.get() == NULL || !web_contents()->GetRenderViewHost())
     return;
-  }
 
   // Only deliver the intent to the renderer if it has the same origin
   // as the initial delivery target.
@@ -102,13 +98,11 @@ bool IntentInjector::OnMessageReceived(const IPC::Message& message) {
 
 void IntentInjector::OnReply(webkit_glue::WebIntentReplyType reply_type,
                              const string16& data) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents))
-    NOTREACHED();
+  if (!intents_dispatcher_)
+    return;
 
-  if (intents_dispatcher_) {
-    // Ensure we only call SendReplyMessage once.
-    content::WebIntentsDispatcher* intents_dispatcher = intents_dispatcher_;
-    intents_dispatcher_ = NULL;
-    intents_dispatcher->SendReplyMessage(reply_type, data);
-  }
+  // Ensure SendReplyMessage is only called once.
+  content::WebIntentsDispatcher* intents_dispatcher = intents_dispatcher_;
+  intents_dispatcher_ = NULL;
+  intents_dispatcher->SendReplyMessage(reply_type, data);
 }