RenderWidget: make routing_id be a parameter of the ctor

content/renderer/render_widget_unittest.cc

 // Copyright 2013 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_widget.h"
 
 #include <tuple>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 35 matching lines @@
  public:
   MOCK_METHOD1(handleInputEvent,
                blink::WebInputEventResult(const blink::WebInputEvent&));
 };
 
 }  // namespace
 
 class InteractiveRenderWidget : public RenderWidget {
  public:
   explicit InteractiveRenderWidget(CompositorDependencies* compositor_deps)
-      : RenderWidget(compositor_deps,
+      : RenderWidget(++next_routing_id_,
+                     compositor_deps,
                      blink::WebPopupTypeNone,
                      ScreenInfo(),
                      false,
                      false,
                      false),
         always_overscroll_(false) {
     webwidget_internal_ = &mock_webwidget_;
-    InitRoutingID(++next_routing_id_);
   }
 
   void SetTouchRegion(const std::vector<gfx::Rect>& rects) {
     rects_ = rects;
   }
 
   void SendInputEvent(const blink::WebInputEvent& event) {
     OnHandleInputEvent(
         &event, ui::LatencyInfo(),
         ui::WebInputEventTraits::ShouldBlockEventStream(event)
@@ skipping 288 matching lines @@
   touch.MovePoint(0, 30, 30);
   touch.touchStartOrFirstTouchMove = false;
   widget()->SendInputEvent(touch);
   histogram_tester().ExpectTotalCount("Event.Touch.TouchLatencyOutsideFling",
                                       2);
 }
 
 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);
     did_show_ = true;
   }
 
   IPC::TestSink* sink() { return &sink_; }
 
   MockWebWidget* mock_webwidget() { return &mock_webwidget_; }
 
   void SetScreenMetricsEmulationParameters(
       bool,
       const blink::WebDeviceEmulationParams&) override {}
@@ skipping 94 matching lines @@
   blink::WebRect popup_emulated_rect(130, 170, 100, 400);
   widget()->setWindowRect(popup_emulated_rect);
 
   EXPECT_EQ(popup_emulated_rect.x, widget()->windowRect().x);
   EXPECT_EQ(popup_emulated_rect.y, widget()->windowRect().y);
   EXPECT_EQ(popup_emulated_rect.x, widget()->viewRect().x);
   EXPECT_EQ(popup_emulated_rect.y, widget()->viewRect().y);
 }
 
 }  // namespace content