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

content/public/renderer/render_view_observer.cc

Index: content/public/renderer/render_view_observer.cc
diff --git a/content/public/renderer/render_view_observer.cc b/content/public/renderer/render_view_observer.cc
index 5e876cc1bff979fbb4fd2e8e70a5d00e81b00b02..8289da949e1311a2769928a660a532edc75c5b44 100644
--- a/content/public/renderer/render_view_observer.cc
+++ b/content/public/renderer/render_view_observer.cc
@@ -6,22 +6,27 @@
 
 #include "content/renderer/render_view_impl.h"
 
+using blink::WebFrame;
+
 namespace content {
 
 RenderViewObserver::RenderViewObserver(RenderView* render_view)
-    : render_view_(static_cast<RenderViewImpl*>(render_view)),
+    : render_view_(render_view),
       routing_id_(MSG_ROUTING_NONE) {
-  // |render_view_| can be null on unit testing or if Observe() is used.
-  if (render_view_) {
-    routing_id_ = render_view_->GetRoutingID();
+  // |render_view| can be NULL on unit testing or if Observe() is used.
+  if (render_view) {
+    RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view);
+    routing_id_ = impl->routing_id();
     // TODO(jam): bring this back DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
-    render_view_->AddObserver(this);
+    impl->AddObserver(this);
   }
 }
 
 RenderViewObserver::~RenderViewObserver() {
-  if (render_view_)
-    render_view_->RemoveObserver(this);
+  if (render_view_) {
+    RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view_);
+    impl->RemoveObserver(this);
+  }
 }
 
 void RenderViewObserver::OnDestruct() {
@@ -45,19 +50,21 @@
 }
 
 void RenderViewObserver::RenderViewGone() {
-  render_view_ = nullptr;
+  render_view_ = NULL;
 }
 
 void RenderViewObserver::Observe(RenderView* render_view) {
-  if (render_view_) {
-    render_view_->RemoveObserver(this);
+  RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view_);
+  if (impl) {
+    impl->RemoveObserver(this);
     routing_id_ = 0;
   }
 
-  render_view_ = static_cast<RenderViewImpl*>(render_view);
-  if (render_view_) {
-    routing_id_ = render_view_->GetRoutingID();
-    render_view_->AddObserver(this);
+  render_view_ = render_view;
+  impl = static_cast<RenderViewImpl*>(render_view_);
+  if (impl) {
+    routing_id_ = impl->routing_id();
+    impl->AddObserver(this);
   }
 }