Revert of Move compositor InputHandler from RenderViewImpl to RenderWidget.

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 946d165a36c4ea54a51dd38f609ae2d5ddf79311..5074de41a6f8a13b9651cc3d5a4a8d0f1cb3ceb3 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -95,7 +95,6 @@
 
 #if defined(OS_ANDROID)
 #include <android/keycodes.h>
-#include "base/time/time.h"
 #endif
 
 #if defined(OS_POSIX)
@@ -381,13 +380,11 @@
       frame_swap_message_queue_(new FrameSwapMessageQueue()),
       resizing_mode_selector_(new ResizingModeSelector()),
       has_host_context_menu_location_(false),
-      has_added_input_handler_(false),
       has_focus_(false),
 #if defined(OS_MACOSX)
       text_input_client_observer_(new TextInputClientObserver(this)),
 #endif
-      focused_pepper_plugin_(nullptr),
-      weak_ptr_factory_(this) {
+      focused_pepper_plugin_(nullptr) {
   DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
@@ -436,7 +433,7 @@
       new RenderWidget(routing_id, compositor_deps, popup_type, screen_info,
                        false, false, false));
   ShowCallback opener_callback =
-      base::Bind(&RenderViewImpl::ShowCreatedPopupWidget, opener->GetWeakPtr());
+      base::Bind(&RenderViewImpl::ShowCreatedPopupWidget, opener->AsWeakPtr());
   widget->Init(opener_callback, RenderWidget::CreateWebWidget(widget.get()));
   DCHECK(!widget->HasOneRef());  // RenderWidget::Init() adds a reference.
   return widget.get();
@@ -1236,7 +1233,6 @@
 
   compositor_ = RenderWidgetCompositor::Create(this, device_scale_factor_,
                                                screen_info_, compositor_deps_);
-  compositor_->SetIsForOopif(for_oopif_);
   compositor_->setViewportSize(physical_backing_size_);
   OnDeviceScaleFactorChanged();
   compositor_->SetDeviceColorSpace(screen_info_.icc_profile.GetColorSpace());
@@ -1249,18 +1245,6 @@
   DCHECK_NE(MSG_ROUTING_NONE, routing_id_);
   compositor_->SetFrameSinkId(
       cc::FrameSinkId(RenderThread::Get()->GetClientId(), routing_id_));
-
-  RenderThreadImpl* render_thread = RenderThreadImpl::current();
-  // render_thread may be NULL in tests.
-  InputHandlerManager* input_handler_manager =
-      render_thread ? render_thread->input_handler_manager() : NULL;
-  if (input_handler_manager) {
-    input_handler_manager->AddInputHandler(
-        routing_id_, compositor()->GetInputHandler(),
-        weak_ptr_factory_.GetWeakPtr(),
-        compositor_deps_->IsScrollAnimatorEnabled());
-    has_added_input_handler_ = true;
-  }
 
   return compositor_.get();
 }
@@ -2193,6 +2177,7 @@
 
 void RenderWidget::setTouchAction(
     blink::WebTouchAction web_touch_action) {
+
   // Ignore setTouchAction calls that result from synthetic touch events (eg.
   // when blink is emulating touch with mouse).
   if (input_handler_->handling_event_type() != WebInputEvent::TouchStart)