Getting rid of more webview memory leaks.

components/guest_view/browser/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 COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
 
 #include <queue>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 42 matching lines @@
  public:
   // Returns a *ViewGuest if this GuestView is of the given view type.
   template <typename T>
   T* As() {
     if (IsViewType(T::Type))
       return static_cast<T*>(this);
 
     return nullptr;
   }
 
+  // Cleans up state when this GuestView is being destroyed.
+  // Note that this cannot be done in the destructor since a GuestView could
+  // potentially be created and destroyed in JavaScript before getting a
+  // GuestViewBase instance. This method can be hidden by a CleanUp() method in
+  // a derived class, in which case the derived method should call this one.
+  static void CleanUp(int embedder_process_id, int view_instance_id);
+
   static GuestViewBase* FromWebContents(
       const content::WebContents* web_contents);
 
   static GuestViewBase* From(int owner_process_id, int instance_id);
 
   // Given a |web_contents|, returns the top level owner WebContents. If
   // |web_contents| does not belong to a GuestView, it will be returned
   // unchanged.
   static content::WebContents* GetTopLevelWebContents(
       content::WebContents* web_contents);
@@ skipping 12 matching lines @@
   // This method is called after this GuestViewBase has been initiated.
   //
   // This gives the derived class an opportunity to perform additional
   // initialization.
   virtual void DidInitialize(const base::DictionaryValue& create_params) {}
 
   // This method is called when the initial set of frames within the page have
   // completed loading.
   virtual void GuestViewDidStopLoading() {}
 
-  // This method is called before the embedder is destroyed.
-  // |owner_web_contents_| should still be valid during this call. This
-  // allows the derived class to perform some cleanup related to the embedder
-  // web contents.
-  virtual void EmbedderWillBeDestroyed() {}
-
   // This method is called when the embedder's zoom changes.
   virtual void EmbedderZoomChanged(double old_zoom_level,
                                    double new_zoom_level) {}
 
   // This method is called when the guest WebContents has been destroyed. This
   // object will be destroyed after this call returns.
   //
   // This gives the derived class an opportunity to perform some cleanup.
   virtual void GuestDestroyed() {}
 
@@ skipping 346 matching lines @@
   // 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 guest_view
 
 #endif  // COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_