Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

content/browser/renderer_host/render_widget_host_impl.h

Index: content/browser/renderer_host/render_widget_host_impl.h
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 76f1f4d36589e3cd27f81f8f7e5c8a22d2a4d330..d48b534fdf7973e0b87c06d6364a434e7d1fb143 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -195,8 +195,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
     return owned_by_render_frame_host_;
   }
 
-  // Tells the renderer to die and then calls Destroy().
-  virtual void Shutdown();
+  // Tells the renderer to die and optionally call Destroy().
+  void ShutdownWidget(bool destroy);
 
   // IPC::Listener
   bool OnMessageReceived(const IPC::Message& msg) override;
@@ -522,13 +522,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
   // crashes, its View is destroyed and this pointer becomes NULL, even though
   // render_view_host_ lives on to load another URL (creating a new View while
   // doing so).
-  RenderWidgetHostViewBase* view_;
-
-  // A weak pointer to the view. The above pointer should be weak, but changing
-  // that to be weak causes crashes on Android.
-  // TODO(ccameron): Fix this.
-  // http://crbug.com/404828
-  base::WeakPtr<RenderWidgetHostViewBase> view_weak_;
+  base::WeakPtr<RenderWidgetHostViewBase> view_;

[ncarter (slow), 2015/11/17 22:22:55]

My understanding was that the RWH owns the RWHV, so the fact that there's a
weak_ptr here is kind of suspect to me (maybe I had things wrong, or maybe
there's weird platformy differences here that make ownership ambiguous).

Generally speaking I don't think you should keep a weak_ptr to something you
own, since it shouldn't disappear without your say-so.

[Avi (use Gerrit), 2015/11/18 00:29:59]

The RWHV owns the RWHI. Note that they (being RenderWidgetHostViewAura/Mac) call
Shutdown on it. This was in the days before we started using scoped_ptr to
indicate ownership, but yeah, the ownership model here is very very very very
wack.

 
  private:
   friend class MockRenderWidgetHost;