NotificationObjectProxy should own the DesktopNotificationDelegateImpl

chrome/browser/notifications/notification_object_proxy.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_OBJECT_PROXY_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_OBJECT_PROXY_H_
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 
 namespace content {
 class DesktopNotificationDelegate;
 class RenderFrameHost;
 }
 
 // A NotificationObjectProxy stands in for the JavaScript Notification object
 // which corresponds to a notification toast on the desktop.  It can be signaled
 // when various events occur regarding the desktop notification, and the
 // attached JS listeners will be invoked in the renderer or worker process.
 class NotificationObjectProxy
     : public NotificationDelegate {
  public:
-  // Creates a Proxy object with the necessary callback information.
+  // Creates a Proxy object with the necessary callback information. The Proxy
+  // will take ownership of |delegate|.
   NotificationObjectProxy(content::RenderFrameHost* render_frame_host,
                           content::DesktopNotificationDelegate* delegate);

[jochen (gone - plz use gerrit), 2014/08/04 09:11:24]

you could make the parameter a scoped_ptr<> to make it clear that it's
transferring ownership

[Peter Beverloo, 2014/08/04 11:33:34]

Done. Plumbed through the ContentBrowserClient as well so that it's clear across
the layers.

 
   // NotificationDelegate implementation.
   virtual void Display() OVERRIDE;
   virtual void Error() OVERRIDE;
   virtual void Close(bool by_user) OVERRIDE;
   virtual void Click() OVERRIDE;
   virtual std::string id() const OVERRIDE;
   virtual int process_id() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
 
  protected:
   friend class base::RefCountedThreadSafe<NotificationObjectProxy>;
 
-  virtual ~NotificationObjectProxy() {}
+  virtual ~NotificationObjectProxy();
 
  private:
   // Callback information to find the JS Notification object where it lives.
   int render_process_id_;
   int render_frame_id_;
-  content::DesktopNotificationDelegate* delegate_;
+  scoped_ptr<content::DesktopNotificationDelegate> delegate_;
   bool displayed_;
   std::string id_;
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_OBJECT_PROXY_H_