NotificationObjectProxy should own the DesktopNotificationDelegateImpl

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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/frame_host/render_frame_host_impl.h"
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/user_metrics_action.h"
@@ skipping 72 matching lines @@
   }
 
   virtual void NotificationError() OVERRIDE {
     RenderFrameHost* rfh =
         RenderFrameHost::FromID(render_process_id_, render_frame_id_);
     if (!rfh)
       return;
 
     rfh->Send(new DesktopNotificationMsg_PostError(
         rfh->GetRoutingID(), notification_id_));
-    delete this;
   }
 
   virtual void NotificationClosed(bool by_user) OVERRIDE {
     RenderFrameHost* rfh =
         RenderFrameHost::FromID(render_process_id_, render_frame_id_);
     if (!rfh)
       return;
 
     rfh->Send(new DesktopNotificationMsg_PostClose(
         rfh->GetRoutingID(), notification_id_, by_user));
     static_cast<RenderFrameHostImpl*>(rfh)->NotificationClosed(
         notification_id_);
-    delete this;
   }
 
   virtual void NotificationClick() OVERRIDE {
     RenderFrameHost* rfh =
         RenderFrameHost::FromID(render_process_id_, render_frame_id_);
     if (!rfh)
       return;
 
     rfh->Send(new DesktopNotificationMsg_PostClick(
         rfh->GetRoutingID(), notification_id_));
@@ skipping 709 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(),
                  callback_context);
 
   GetContentClient()->browser()->RequestDesktopNotificationPermission(
       source_origin, this, done_callback);
 }
 
 void RenderFrameHostImpl::OnShowDesktopNotification(
     int notification_id,
     const ShowDesktopNotificationHostMsgParams& params) {
+  scoped_ptr<DesktopNotificationDelegateImpl> delegate(
+      new DesktopNotificationDelegateImpl(this, notification_id));
+
   base::Closure cancel_callback;
   GetContentClient()->browser()->ShowDesktopNotification(
-      params, this,
-      new DesktopNotificationDelegateImpl(this, notification_id),
+      params,
+      this,
+      delegate.PassAs<DesktopNotificationDelegate>(),
       &cancel_callback);
   cancel_notification_callbacks_[notification_id] = cancel_callback;
 }
 
 void RenderFrameHostImpl::OnCancelDesktopNotification(int notification_id) {
   if (!cancel_notification_callbacks_.count(notification_id)) {
     NOTREACHED();
     return;
   }
   cancel_notification_callbacks_[notification_id].Run();
@@ skipping 341 matching lines @@
       FROM_HERE,
       base::Bind(
           &TransitionRequestManager::SetHasPendingTransitionRequest,
           base::Unretained(TransitionRequestManager::GetInstance()),
           GetProcess()->GetID(),
           routing_id_,
           has_pending_request));
 }
 
 }  // namespace content