RenderWidget: make routing_id be a parameter of the ctor

content/renderer/render_widget_unittest.cc

Index: content/renderer/render_widget_unittest.cc
diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc
index 1cc29f4fadff4c5d9978381f90ec813b32b9afef..a0e894b4c6272055172f1ffa9ada65db25741142 100644
--- a/content/renderer/render_widget_unittest.cc
+++ b/content/renderer/render_widget_unittest.cc
@@ -53,7 +53,8 @@ class MockWebWidget : public blink::WebWidget {
 class InteractiveRenderWidget : public RenderWidget {
  public:
   explicit InteractiveRenderWidget(CompositorDependencies* compositor_deps)
-      : RenderWidget(compositor_deps,
+      : RenderWidget(++next_routing_id_,
+                     compositor_deps,
                      blink::WebPopupTypeNone,
                      ScreenInfo(),
                      false,
@@ -61,7 +62,7 @@ class InteractiveRenderWidget : public RenderWidget {
                      false),
         always_overscroll_(false) {
     webwidget_internal_ = &mock_webwidget_;
-    InitRoutingID(++next_routing_id_);
+    InitInputHandler();
   }
 
   void SetTouchRegion(const std::vector<gfx::Rect>& rects) {
@@ -370,14 +371,15 @@ TEST_F(RenderWidgetUnittest, TouchDuringOrOutsideFlingUmaMetrics) {
 class PopupRenderWidget : public RenderWidget {
  public:
   explicit PopupRenderWidget(CompositorDependencies* compositor_deps)
-      : RenderWidget(compositor_deps,
+      : RenderWidget(1,
+                     compositor_deps,
                      blink::WebPopupTypePage,
                      ScreenInfo(),
                      false,
                      false,
                      false) {
     webwidget_internal_ = &mock_webwidget_;
-    InitRoutingID(1);
+    InitInputHandler();
     did_show_ = true;
   }