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

content/browser/intents/intent_injector.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 "content/browser/intents/intent_injector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 48 matching lines @@
   intents_dispatcher_ = NULL;
   delete this;
 }
 
 void IntentInjector::OnSendReturnMessage(
     webkit_glue::WebIntentReplyType reply_type) {
   intents_dispatcher_ = NULL;
 }
 
 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.
   if (initial_url_.GetOrigin() !=
       render_view_host->GetSiteInstance()->GetSite().GetOrigin()) {
     return;
   }
 
   if (source_intent_->data_type == webkit_glue::WebIntentData::BLOB) {
     // Grant read permission on the blob file to the delivered context.
@@ skipping 10 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(IntentInjector, message)
     IPC_MESSAGE_HANDLER(IntentsHostMsg_WebIntentReply, OnReply);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 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);
 }