Browser Plugin: Removed BrowserPluginWebContentsObserver (to be replaced by rewritten BrowserPlugi…

content/browser/renderer_host/render_view_host_impl.h

Index: content/browser/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 8667787330876a3e3ae8f5ea13f92141e21f8de8..e4c474186e5a0ecaed0216a6916c9c6afba97b91 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -229,13 +229,19 @@ class CONTENT_EXPORT RenderViewHostImpl
 
   // Set up the RenderView child process. Virtual because it is overridden by
   // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used
-  // as the name of the new top-level frame.  The |opener_route_id| parameter
-  // indicates which RenderView created this (MSG_ROUTING_NONE if none). If
-  // |max_page_id| is larger than -1, the RenderView is told to start issuing
-  // page IDs at |max_page_id| + 1.
+  // as the name of the new top-level frame.  If |max_page_id| is larger than
+  // -1, the RenderView is told to start issuing page IDs at |max_page_id| + 1.
+  // If this RenderView is a guest, the embedder's process id and routing ID
+  // is also passed in so that the RenderView's process can establish a channel
+  // with its embedder if it's not already established.
+  // The |opener_route_id| parameter indicates which RenderView created this
+  // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the
+  // RenderView is told to start issuing page IDs at |max_page_id| + 1.

[Charlie Reis, 2012/05/11 17:41:03]

Nit: Why move the opener_route_id comment to the end if it's the second
parameter?

[Fady Samuel, 2012/05/11 22:03:34]

Done.

   virtual bool CreateRenderView(const string16& frame_name,
                                 int opener_route_id,
-                                int32 max_page_id);
+                                int32 max_page_id,
+                                int embedder_process_id,
+                                int embedder_routing_id);
 
   base::TerminationStatus render_view_termination_status() const {
     return render_view_termination_status_;
@@ -350,8 +356,6 @@ class CONTENT_EXPORT RenderViewHostImpl
     sudden_termination_allowed_ = enabled;
   }
 
-  void set_guest(bool guest) { guest_ = guest; }
-
   // RenderWidgetHost public overrides.
   virtual void Shutdown() OVERRIDE;
   virtual bool IsRenderView() const OVERRIDE;
@@ -560,9 +564,6 @@ class CONTENT_EXPORT RenderViewHostImpl
   // See BindingsPolicy for details.
   int enabled_bindings_;
 
-  // Indicates whether or not this RenderViewHost refers to a guest RenderView.
-  bool guest_;
-
   // The request_id for the pending cross-site request. Set to -1 if
   // there is a pending request, but we have not yet started the unload
   // for the current page. Set to the request_id value of the pending