Revert of Separate RenderView from RenderWidget, part 1: inheritance.

content/renderer/npapi/webplugin_delegate_proxy.cc

Index: content/renderer/npapi/webplugin_delegate_proxy.cc
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc
index 0aacc3dbffe619250d5934656cb68b061c4ec51a..68a69544f26d8aa3a41183d5fa3c705cf9c4d6d0 100644
--- a/content/renderer/npapi/webplugin_delegate_proxy.cc
+++ b/content/renderer/npapi/webplugin_delegate_proxy.cc
@@ -141,7 +141,7 @@
 #if defined(OS_WIN)
   if (dummy_activation_window_ && render_view_) {
     render_view_->Send(new ViewHostMsg_WindowlessPluginDummyWindowDestroyed(
-        render_view_->GetRoutingID(), dummy_activation_window_));
+        render_view_->routing_id(), dummy_activation_window_));
   }
   dummy_activation_window_ = NULL;
 #endif
@@ -268,7 +268,7 @@
   params.page_url = page_url_;
   params.arg_names = arg_names;
   params.arg_values = arg_values;
-  params.host_render_view_routing_id = render_view_->GetRoutingID();
+  params.host_render_view_routing_id = render_view_->routing_id();
   params.load_manually = load_manually;
 
   result = false;
@@ -680,8 +680,8 @@
 void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) {
   IPC::Message* msg;
   if (is_visible) {
-    gfx::Rect window_frame = render_view_->GetWidget()->rootWindowRect();
-    gfx::Rect view_frame = render_view_->GetWidget()->windowRect();
+    gfx::Rect window_frame = render_view_->rootWindowRect();
+    gfx::Rect view_frame = render_view_->windowRect();
     blink::WebView* webview = render_view_->webview();
     msg = new PluginMsg_ContainerShown(instance_id_, window_frame, view_frame,
                                        webview && webview->isActive());
@@ -746,7 +746,7 @@
 
   dummy_activation_window_ = dummy_activation_window;
   render_view_->Send(new ViewHostMsg_WindowlessPluginDummyWindowCreated(
-      render_view_->GetRoutingID(), dummy_activation_window_));
+      render_view_->routing_id(), dummy_activation_window_));
 
   // Bug 25583: this can be null because some "virus scanners" block the
   // DuplicateHandle call in the plugin process.
@@ -767,7 +767,7 @@
   params.mode = ui::TEXT_INPUT_MODE_DEFAULT;
   params.can_compose_inline = true;
   render_view_->Send(new ViewHostMsg_TextInputStateChanged(
-      render_view_->GetRoutingID(), params));
+      render_view_->routing_id(), params));
 
   ViewHostMsg_SelectionBounds_Params bounds_params;
   bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect;
@@ -775,7 +775,8 @@
       blink::WebTextDirectionLeftToRight;
   bounds_params.is_anchor_first = true;
   render_view_->Send(new ViewHostMsg_SelectionBoundsChanged(
-      render_view_->GetRoutingID(), bounds_params));
+      render_view_->routing_id(),
+      bounds_params));
 }
 #endif