Fix RenderWidgetHostViewGuest leak.

content/browser/web_contents/web_contents_view_guest.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_guest.h"
 
 #include "build/build_config.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
@@ skipping 122 matching lines @@
 }
 #endif
 
 void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
                                       gfx::NativeView context) {
   platform_view_->CreateView(initial_size, context);
   size_ = initial_size;
 }
 
 RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
-    RenderWidgetHost* render_widget_host) {
+    RenderWidgetHost* render_widget_host, bool is_guest_view_hack) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
     DCHECK(RenderViewHostFactory::has_factory());
     return static_cast<RenderWidgetHostViewBase*>(
         render_widget_host->GetView());
   }
 
   RenderWidgetHostViewBase* platform_widget =
-      platform_view_->CreateViewForWidget(render_widget_host);
+      platform_view_->CreateViewForWidget(render_widget_host, true);
 
   return new RenderWidgetHostViewGuest(render_widget_host,
                                        guest_,
-                                       platform_widget);
+                                       platform_widget->GetWeakPtr());
 }
 
 RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget(
-    RenderWidgetHost* render_widget_host) {
-  return platform_view_->CreateViewForPopupWidget(render_widget_host);
+    RenderWidgetHost* render_widget_host, bool is_guest_view_hack) {
+  return platform_view_->CreateViewForPopupWidget(render_widget_host, true);

[piman, 2014/10/14 23:48:06]

I don't think we should pass true. This is called when we want to create a
popup, with a new top-level RWH, but that view doesn't become a
RenderWidgetHostViewGuest's platform_view, right?

I don't think we need to pass the is_guest_view_hack in all the
CreateViewForPopupWidget's.

[lazyboy, 2014/10/15 04:50:11]

Oh that's right, these views don't have a wrapped RWHVGuest.
Reverted CreateViewForPopupWidget changes.

 }
 
 void WebContentsViewGuest::SetPageTitle(const base::string16& title) {
 }
 
 void WebContentsViewGuest::RenderViewCreated(RenderViewHost* host) {
   platform_view_->RenderViewCreated(host);
 }
 
 void WebContentsViewGuest::RenderViewSwappedIn(RenderViewHost* host) {
@@ skipping 73 matching lines @@
       embedder_render_view_host->GetDelegate()->GetDelegateView();
   if (view) {
     RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.StartDrag"));
     view->StartDragging(drop_data, ops, image, image_offset, event_info);
   } else {
     embedder_web_contents->SystemDragEnded();
   }
 }
 
 }  // namespace content