Getting rid of more webview memory leaks.

components/guest_view/browser/guest_view_base.cc

 // 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.
 
 #include "components/guest_view/browser/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/guest_view/browser/guest_view_event.h"
 #include "components/guest_view/browser/guest_view_manager.h"
@@ skipping 92 matching lines @@
  private:
   bool is_fullscreen_;
   bool destroyed_;
   GuestViewBase* guest_;
 
   void Destroy() {
     if (destroyed_)
       return;
 
     destroyed_ = true;
-    guest_->EmbedderWillBeDestroyed();
+    GuestViewManager::FromBrowserContext(web_contents()->GetBrowserContext())
+        ->EmbedderWillBeDestroyed(
+            web_contents()->GetRenderProcessHost()->GetID());
     guest_->Destroy();
   }
 
   DISALLOW_COPY_AND_ASSIGN(OwnerContentsObserver);
 };
 
-// This observer ensures that the GuestViewBase destroys itself when its
-// embedder goes away.
+// This observer ensures that the GuestViewBase destroys itself if its opener
+// WebContents goes away before the GuestViewBase is attached.
 class GuestViewBase::OpenerLifetimeObserver : public WebContentsObserver {
  public:
   OpenerLifetimeObserver(GuestViewBase* guest)
       : WebContentsObserver(guest->GetOpener()->web_contents()),
         guest_(guest) {}
 
   ~OpenerLifetimeObserver() override {}
 
   // WebContentsObserver implementation.
   void WebContentsDestroyed() override {
@@ skipping 179 matching lines @@
     }
 
     DispatchOnResizeEvent(guest_size_, new_size);
     guest_size_ = new_size;
   }
 
   auto_size_enabled_ = enable_auto_size;
 }
 
 // static
+void GuestViewBase::CleanUp(int embedder_process_id, int view_instance_id) {
+  // TODO(paulmeyer): Add in any general GuestView cleanup work here.
+}
+
+// static
 GuestViewBase* GuestViewBase::FromWebContents(const WebContents* web_contents) {
   WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
   auto it = guest_map->find(web_contents);
   return it == guest_map->end() ? nullptr : it->second;
 }
 
 // static
 GuestViewBase* GuestViewBase::From(int owner_process_id,
                                    int guest_instance_id) {
   auto host = content::RenderProcessHost::FromID(owner_process_id);
@@ skipping 492 matching lines @@
 
   auto embedder_zoom_controller =
       ui_zoom::ZoomController::FromWebContents(owner_web_contents());
   // Chrome Apps do not have a ZoomController.
   if (!embedder_zoom_controller)
     return;
   embedder_zoom_controller->RemoveObserver(this);
 }
 
 }  // namespace guest_view