Disable content intent detectors in the renderer

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 2671 matching lines @@
   main_render_frame_->Send(new FrameHostMsg_UpdatePageImportanceSignals(
       main_render_frame_->GetRoutingID(), signals));
 }
 
 // TODO(dglazkov): Remove this ifdef. The content detection code
 // should not be platform-specific.
 // See http://crbug.com/635214 for details.
 #if defined(OS_ANDROID)
 WebURL RenderViewImpl::detectContentIntentAt(
     const WebHitTestResult& touch_hit) {
+  // TODO(twellington): Remove content detection entirely. It is
+  // currently only enabled for tests. crbug.com/664307.
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableContentIntentDetection)) {
+    return  WebURL();;

[aelias_OOO_until_Jul13, 2016/11/10 23:27:37]

nit: duplicate whitespace and semicolons

[Theresa, 2016/11/10 23:32:19]

Done.

+  }
   DCHECK(touch_hit.node().isTextNode());
 
   // Process the position with all the registered content detectors until
   // a match is found. Priority is provided by their relative order.
   for (const auto& detector : content_detectors_) {
     WebURL intent = detector->FindTappedContent(touch_hit);
     if (intent.isValid()) {
       return intent;
     }
   }
@@ skipping 262 matching lines @@
                             INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   }
 
   std::unique_ptr<InputEventAck> ack(
       new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type,
                         INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
   OnInputEventAck(std::move(ack));
 }
 
 }  // namespace content