Remove IPC messages from RenderViewObserver.

No one listens or sends messages via RenderViewObserver anymore.

BUG=1097816

Change-Id: I760e8f97992a23f6aaec51cb187405881f494471
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2476754Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817654}

content/public/renderer/render_view_observer.cc

@@ -9,11 +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();
     render_view_->AddObserver(this);
   }
 }
@@ -23,19 +21,7 @@ RenderViewObserver::~RenderViewObserver() {
     render_view_->RemoveObserver(this);
 }
 
-bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) {
-  return false;
-}
-
-bool RenderViewObserver::Send(IPC::Message* message) {
-  if (render_view_)
-    return render_view_->Send(message);
-
-  delete message;
-  return false;
-}
-
-RenderView* RenderViewObserver::render_view() const {
+RenderView* RenderViewObserver::render_view() {
   return render_view_;
 }
 
@@ -46,12 +32,10 @@ void RenderViewObserver::RenderViewGone() {
 void RenderViewObserver::Observe(RenderView* render_view) {
   if (render_view_) {
     render_view_->RemoveObserver(this);
-    routing_id_ = MSG_ROUTING_NONE;
   }
 
   render_view_ = static_cast<RenderViewImpl*>(render_view);
   if (render_view_) {
-    routing_id_ = render_view_->GetRoutingID();
     render_view_->AddObserver(this);
   }
 }

content/public/renderer/render_view_observer.h

@@ -18,8 +18,7 @@ class RenderViewImpl;
 
 // Base class for objects that want to filter incoming IPCs, and also get
 // notified of changes to the frame.
-class CONTENT_EXPORT RenderViewObserver : public IPC::Listener,
-                                          public IPC::Sender {
+class CONTENT_EXPORT RenderViewObserver {
  public:
   // A subclass can use this to delete itself. If it does not, the subclass must
   // always null-check each call to render_view() because the RenderView can
@@ -34,18 +33,11 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Listener,
 
   virtual void OnPageVisibilityChanged(PageVisibilityState visibility_state) {}
 
-  // IPC::Listener implementation.
-  bool OnMessageReceived(const IPC::Message& message) override;
-
-  // IPC::Sender implementation.
-  bool Send(IPC::Message* message) override;
-
-  RenderView* render_view() const;
-  int routing_id() const { return routing_id_; }
+  RenderView* render_view();
 
  protected:
   explicit RenderViewObserver(RenderView* render_view);
-  ~RenderViewObserver() override;
+  virtual ~RenderViewObserver();
 
   // Sets |render_view_| to track.
   // Removes itself of previous (if any) |render_view_| observer list and adds
@@ -61,8 +53,6 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Listener,
   void RenderViewGone();
 
   RenderViewImpl* render_view_;
-  // The routing ID of the associated RenderView.
-  int routing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewObserver);
 };

content/renderer/render_view_impl.cc

@@ -535,11 +535,6 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
         active_url, main_frame->Top()->GetSecurityOrigin().ToString().Utf8());
   }
 
-  for (auto& observer : observers_) {
-    if (observer.OnMessageReceived(message))
-      return true;
-  }
-
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderViewImpl, message)
     IPC_MESSAGE_HANDLER(ViewMsg_MoveOrResizeStarted, OnMoveOrResizeStarted)