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

content/browser/intents/intent_injector.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/logging.h"
 #include "base/string16.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 37 matching lines @@
   source_intent_.reset(new webkit_glue::WebIntentData(intent));
 }
 
 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::kEnableWebIntents) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableWebIntents) ||
       web_contents()->GetRenderViewHost() == NULL) {
     return;
   }
 
   render_view_host->Send(new IntentsMsg_SetWebIntentData(
       render_view_host->routing_id(), *(source_intent_.get())));
 }
 
 bool IntentInjector::OnMessageReceived(const IPC::Message& message) {
   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::kEnableWebIntents))
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents))
     NOTREACHED();
 
   if (intents_dispatcher_) {
     // Ensure we only call SendReplyMessage once.
     content::WebIntentsDispatcher* intents_dispatcher = intents_dispatcher_;
     intents_dispatcher_ = NULL;
     intents_dispatcher->SendReplyMessage(reply_type, data);
   }
 }