RenderWidget: make routing_id be a parameter of the ctor

content/renderer/render_widget.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 124 matching lines @@
 
   // Creates a new RenderWidget that will be attached to a RenderFrame.
   static RenderWidget* CreateForFrame(int widget_routing_id,
                                       bool hidden,
                                       const ScreenInfo& screen_info,
                                       CompositorDependencies* compositor_deps,
                                       blink::WebLocalFrame* frame);
 
   // Used by content_layouttest_support to hook into the creation of
   // RenderWidgets.
-  using CreateRenderWidgetFunction =
-      RenderWidget* (*)(CompositorDependencies*,
-                        blink::WebPopupType,
-                        const ScreenInfo&,
-                        bool,
-                        bool,
-                        bool);
+  using CreateRenderWidgetFunction = RenderWidget* (*)(int32_t,
+                                                       CompositorDependencies*,
+                                                       blink::WebPopupType,
+                                                       const ScreenInfo&,
+                                                       bool,
+                                                       bool,
+                                                       bool);
   using RenderWidgetInitializedCallback = void (*)(RenderWidget*);
   static void InstallCreateHook(
       CreateRenderWidgetFunction create_render_widget,
       RenderWidgetInitializedCallback render_widget_initialized_callback);
 
   // Closes a RenderWidget that was created by |CreateForFrame|.
   // TODO(avi): De-virtualize this once RenderViewImpl has-a RenderWidget.
   // https://crbug.com/545684
   virtual void CloseForFrame();
 
-  int32_t routing_id() const {
-    return routing_id_;
-  }
+  int32_t routing_id() const { return routing_id_; }
 
   CompositorDependencies* compositor_deps() const { return compositor_deps_; }
   virtual blink::WebWidget* GetWebWidget() const;
 
   // Returns the current instance of WebInputMethodController which is to be
   // used for IME related tasks. This instance corresponds to the one from
   // focused frame and can be nullptr.
   blink::WebInputMethodController* GetInputMethodController() const;
 
   const gfx::Size& size() const { return size_; }
@@ skipping 244 matching lines @@
   friend class base::RefCounted<RenderWidget>;
 
   // For unit tests.
   friend class RenderWidgetTest;
 
   enum ResizeAck {
     SEND_RESIZE_ACK,
     NO_RESIZE_ACK,
   };
 
-  RenderWidget(CompositorDependencies* compositor_deps,
+  RenderWidget(int32_t widget_routing_id,
+               CompositorDependencies* compositor_deps,
                blink::WebPopupType popup_type,
                const ScreenInfo& screen_info,
                bool swapped_out,
                bool hidden,
                bool never_visible);
 
   ~RenderWidget() override;
 
   static blink::WebFrameWidget* CreateWebFrameWidget(
       RenderWidget* render_widget,
       blink::WebLocalFrame* frame);
 
   // Creates a WebWidget based on the popup type.
   static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget);
 
-  // Called by Create() functions and subclasses, after the routing_id is
-  // available. Must be called before Init().
-  void InitRoutingID(int32_t routing_id);
-
   // Called by Create() functions and subclasses to finish initialization.
   void Init(int32_t opener_id, blink::WebWidget* web_widget);
 
   // Allows the process to exit once the unload handler has finished, if there
   // are no other active RenderWidgets.
   void WasSwappedOut();
 
   void DoDeferredClose();
   void NotifyOnClose();
 
@@ skipping 142 matching lines @@
   void setTouchAction(blink::WebTouchAction touch_action) override;
 
   // Called when value of focused text field gets dirty, e.g. value is modified
   // by script, not by user input.
   void didUpdateTextOfFocusedElementByNonUserInput() override;
 
   // Sends an ACK to the browser process during the next compositor frame.
   void OnWaitNextFrameForTests(int routing_id);
 
   // Routing ID that allows us to communicate to the parent browser process
-  // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent.
-  int32_t routing_id_;
+  // RenderWidgetHost.
+  const int32_t routing_id_;
 
   // Dependencies for initializing a compositor, including flags for optional
   // features.
   CompositorDependencies* const compositor_deps_;
 
   // Use GetWebWidget() instead of using webwidget_internal_ directly.
   // We are responsible for destroying this object via its Close method.
   // May be NULL when the window is closing.
   blink::WebWidget* webwidget_internal_;
 
@@ skipping 205 matching lines @@
   // being handled. If the current event results in starting a drag/drop
   // session, this info is sent to the browser along with other drag/drop info.
   DragEventSourceInfo possible_drag_event_info_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_