Revert of Remove the RenderProcessHost observer and attach the WebContentsObserver earlier to the GuestView.

extensions/browser/guest_view/guest_view_base.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 
 #include <queue>
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 
 struct RendererContentSettingRules;
 
 namespace extensions {
 
 // A GuestViewBase is the base class browser-side API implementation for a
 // <*view> tag. GuestViewBase maintains an association between a guest
 // WebContents and an embedder WebContents. It receives events issued from
 // the guest and relays them to the embedder. GuestViewBase tracks the lifetime
 // of its embedder render process until it is attached to a particular embedder
 // WebContents. At that point, its lifetime is restricted in scope to the
 // lifetime of its embedder WebContents.
 class GuestViewBase : public content::BrowserPluginGuestDelegate,
+                      public content::RenderProcessHostObserver,
                       public content::WebContentsDelegate,
                       public content::WebContentsObserver {
  public:
   class Event {
    public:
     Event(const std::string& name, scoped_ptr<base::DictionaryValue> args);
     ~Event();
 
     const std::string& name() const { return name_; }
 
@@ skipping 123 matching lines @@
       const base::DictionaryValue& create_params,
       const WebContentsCreatedCallback& callback) = 0;
 
   // This creates a WebContents and initializes |this| GuestViewBase to use the
   // newly created WebContents.
   void Init(const std::string& embedder_extension_id,
             content::WebContents* embedder_web_contents,
             const base::DictionaryValue& create_params,
             const WebContentsCreatedCallback& callback);
 
-  void InitWithWebContents(const std::string& embedder_extension_id,
-                           content::WebContents* embedder_web_contents,
-                           content::WebContents* guest_web_contents);
+  void InitWithWebContents(
+      const std::string& embedder_extension_id,
+      int embedder_render_process_id,
+      content::WebContents* guest_web_contents);
 
   bool IsViewType(const char* const view_type) const {
     return !strcmp(GetViewType(), view_type);
   }
 
   // Toggles autosize mode for this GuestView.
   void SetAutoSize(bool enabled,
                    const gfx::Size& min_size,
                    const gfx::Size& max_size);
 
@@ skipping 34 matching lines @@
     return opener_.get();
   }
 
   // Destroy this guest.
   void Destroy();
 
   // Saves the attach state of the custom element hosting this GuestView.
   void SetAttachParams(const base::DictionaryValue& params);
   void SetOpener(GuestViewBase* opener);
 
+  // RenderProcessHostObserver implementation
+  virtual void RenderProcessExited(content::RenderProcessHost* host,
+                                   base::ProcessHandle handle,
+                                   base::TerminationStatus status,
+                                   int exit_code) override;
+
   // BrowserPluginGuestDelegate implementation.
   virtual void DidAttach(int guest_proxy_routing_id) override final;
   virtual void ElementSizeChanged(const gfx::Size& old_size,
                                   const gfx::Size& new_size) override final;
   virtual void GuestSizeChanged(const gfx::Size& old_size,
                                 const gfx::Size& new_size) override final;
   virtual void RegisterDestructionCallback(
       const DestructionCallback& callback) override final;
   virtual void WillAttach(
       content::WebContents* embedder_web_contents,
       int browser_plugin_instance_id) override final;
 
   // Dispatches an event |event_name| to the embedder with the |event| fields.
   void DispatchEventToEmbedder(Event* event);
 
  protected:
   GuestViewBase(content::BrowserContext* browser_context,
                 int guest_instance_id);
 
   virtual ~GuestViewBase();
 
  private:
-  class EmbedderLifetimeObserver;
+  class EmbedderWebContentsObserver;
 
   void SendQueuedEvents();
 
   void CompleteInit(const std::string& embedder_extension_id,
-                    content::WebContents* embedder_web_contents,
+                    int embedder_render_process_id,
                     const WebContentsCreatedCallback& callback,
                     content::WebContents* guest_web_contents);
 
   static void RegisterGuestViewTypes();
 
   // WebContentsObserver implementation.
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) override final;
   virtual void RenderViewReady() override final;
   virtual void WebContentsDestroyed() override final;
@@ skipping 37 matching lines @@
   base::WeakPtr<GuestViewBase> opener_;
 
   DestructionCallback destruction_callback_;
 
   // The parameters associated with the element hosting this GuestView that
   // are passed in from JavaScript. This will typically be the view instance ID,
   // and element-specific parameters. These parameters are passed along to new
   // guests that are created from this guest.
   scoped_ptr<base::DictionaryValue> attach_params_;
 
-  scoped_ptr<EmbedderLifetimeObserver> embedder_web_contents_observer_;
+  scoped_ptr<EmbedderWebContentsObserver> embedder_web_contents_observer_;
 
   // The size of the container element.
   gfx::Size element_size_;
 
   // The size of the guest content. Note: In autosize mode, the container
   // element may not match the size of the guest.
   gfx::Size guest_size_;
 
   // Indicates whether autosize mode is enabled or not.
   bool auto_size_enabled_;
 
   // The maximum size constraints of the container element in autosize mode.
   gfx::Size max_auto_size_;
 
   // The minimum size constraints of the container element in autosize mode.
   gfx::Size min_auto_size_;
 
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<GuestViewBase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewBase);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_