ABANDONED CL: Fix delivery of TestFinishedInSecondaryWindow message from OOPIFs.

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..0b44139d569a62c80a9f56a259dda96958c9afe2 100644
--- a/content/public/renderer/render_view_observer.cc
+++ b/content/public/renderer/render_view_observer.cc
@@ -9,12 +9,9 @@
 namespace content {
 
 RenderViewObserver::RenderViewObserver(RenderView* render_view)
-    : render_view_(static_cast<RenderViewImpl*>(render_view)),
-      routing_id_(MSG_ROUTING_NONE) {
+    : render_view_(static_cast<RenderViewImpl*>(render_view)) {
   // |render_view_| can be null on unit testing or if Observe() is used.
   if (render_view_) {
-    routing_id_ = render_view_->GetRoutingID();
-    // TODO(jam): bring this back DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
     render_view_->AddObserver(this);
   }
 }
@@ -44,6 +41,10 @@ RenderView* RenderViewObserver::render_view() const {
   return render_view_;
 }
 
+int RenderViewObserver::routing_id() const {
+  return render_view_ ? render_view_->routing_id() : MSG_ROUTING_NONE;
+}
+
 void RenderViewObserver::RenderViewGone() {
   render_view_ = nullptr;
 }
@@ -51,12 +52,10 @@ void RenderViewObserver::RenderViewGone() {
 void RenderViewObserver::Observe(RenderView* render_view) {
   if (render_view_) {
     render_view_->RemoveObserver(this);
-    routing_id_ = 0;
   }
 
   render_view_ = static_cast<RenderViewImpl*>(render_view);
   if (render_view_) {
-    routing_id_ = render_view_->GetRoutingID();
     render_view_->AddObserver(this);
   }
 }