Fix API changes of Chrome 53

atom/renderer/atom_render_view_observer.cc

@@ -103,7 +103,6 @@ AtomRenderViewObserver::AtomRenderViewObserver(
     content::RenderView* render_view,
     AtomRendererClient* renderer_client)
     : content::RenderViewObserver(render_view),
-      renderer_client_(renderer_client),
       document_created_(false) {
   // Initialise resource for directory listing.
   net::NetModule::SetResourceProvider(NetResourceProvider);
@@ -151,6 +150,10 @@ bool AtomRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
+void AtomRenderViewObserver::OnDestruct() {
+  delete this;
+}
+
 void AtomRenderViewObserver::OnBrowserMessage(bool send_to_all,
                                               const base::string16& channel,
                                               const base::ListValue& args) {

atom/renderer/atom_render_view_observer.h

@@ -29,14 +29,12 @@ class AtomRenderViewObserver : public content::RenderViewObserver {
   void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;
   void DraggableRegionsChanged(blink::WebFrame* frame) override;
   bool OnMessageReceived(const IPC::Message& message) override;
+  void OnDestruct() override;
 
   void OnBrowserMessage(bool send_to_all,
                         const base::string16& channel,
                         const base::ListValue& args);
 
-  // Weak reference to renderer client.
-  AtomRendererClient* renderer_client_;
-
   // Whether the document object has been created.
   bool document_created_;
 

atom/renderer/atom_renderer_client.cc

@@ -13,7 +13,6 @@
 #include "atom/common/color_util.h"
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_bindings.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/atom_render_view_observer.h"
 #include "atom/renderer/guest_view_container.h"
@@ -51,6 +50,8 @@
 #include <shlobj.h>
 #endif
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 namespace {
@@ -85,6 +86,10 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
     renderer_client_->WillReleaseScriptContext(context, render_frame_);
   }
 
+  void OnDestruct() override {
+    delete this;
+  }
+
  private:
   content::RenderFrame* render_frame_;
   int world_id_;

atom/renderer/guest_view_container.cc

@@ -22,8 +22,7 @@ static base::LazyInstance<GuestViewContainerMap> g_guest_view_container_map =
 }  // namespace
 
 GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame)
-    : render_frame_(render_frame),
-      weak_ptr_factory_(this) {
+    : weak_ptr_factory_(this) {
 }
 
 GuestViewContainer::~GuestViewContainer() {

atom/renderer/guest_view_container.h

@@ -32,7 +32,6 @@ class GuestViewContainer : public content::BrowserPluginDelegate {
 
  private:
   int element_instance_id_;
-  content::RenderFrame* render_frame_;
 
   ResizeCallback element_resize_callback_;