Rename RenderView to RenderViewImpl. Update Chrome's DEPS so that it can't include the RenderView...

content/public/renderer/render_view_observer.h

 // Copyright (c) 2011 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_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
@@ skipping 61 matching lines @@
 
   // These match the RenderView methods.
   virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {}
   virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) {}
 
   virtual void WillCreateMediaPlayer(WebKit::WebFrame* frame,
                                      WebKit::WebMediaPlayerClient* client) {}
   virtual void ContextMenuAction(unsigned id) {}
   virtual void Navigate(const GURL& url) {}
 
+  // IPC::Channel::Listener implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message);
+
+  // This is called by the RenderView when it's going away so that this object
+  // can null out its pointer.
+  void RenderViewGone();
+
  protected:
   explicit RenderViewObserver(RenderView* render_view);
   virtual ~RenderViewObserver();
 
-  // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-
   // IPC::Message::Sender implementation.
   virtual bool Send(IPC::Message* message);
 
   RenderView* render_view();
   int routing_id() { return routing_id_; }
 
  private:
-  friend class ::RenderView;
 
-  void set_render_view(::RenderView* rv);
-
-  ::RenderView* render_view_;
+  RenderView* render_view_;
   // The routing ID of the associated RenderView.
   int routing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_