Store unique_ptr instead of raw poiter in extension callback map

extensions/browser/extension_function_dispatcher.cc

 // Copyright 2014 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 "extensions/browser/extension_function_dispatcher.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 122 matching lines @@
   void RenderFrameDeleted(
       content::RenderFrameHost* render_frame_host) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (render_frame_host != render_frame_host_)
       return;
 
     if (dispatcher_.get()) {
       dispatcher_->ui_thread_response_callback_wrappers_
           .erase(render_frame_host);
     }
-
-    delete this;
   }
 
   ExtensionFunction::ResponseCallback CreateCallback(int request_id) {
     return base::Bind(
         &UIThreadResponseCallbackWrapper::OnExtensionFunctionCompleted,
         weak_ptr_factory_.GetWeakPtr(),
         request_id);
   }
 
  private:
@@ skipping 208 matching lines @@
   if (render_frame_host) {
     // Extension API from a non Service Worker context, e.g. extension page,
     // background page, content script.
     UIThreadResponseCallbackWrapperMap::const_iterator iter =
         ui_thread_response_callback_wrappers_.find(render_frame_host);
     UIThreadResponseCallbackWrapper* callback_wrapper = nullptr;
     if (iter == ui_thread_response_callback_wrappers_.end()) {
       callback_wrapper =
           new UIThreadResponseCallbackWrapper(AsWeakPtr(), render_frame_host);
       ui_thread_response_callback_wrappers_[render_frame_host] =
-          callback_wrapper;
+          base::WrapUnique(callback_wrapper);
     } else {
-      callback_wrapper = iter->second;
+      callback_wrapper = iter->second.get();
     }
     DispatchWithCallbackInternal(
         params, render_frame_host, render_process_id,
         callback_wrapper->CreateCallback(params.request_id));
   } else {
     // Extension API from Service Worker.
     DCHECK_NE(kInvalidServiceWorkerVersionId, params.service_worker_version_id);
     WorkerResponseCallbackMapKey key(render_process_id,
                                      params.service_worker_version_id);
     UIThreadWorkerResponseCallbackWrapperMap::const_iterator iter =
@@ skipping 214 matching lines @@
 // static
 void ExtensionFunctionDispatcher::SendAccessDenied(
     const ExtensionFunction::ResponseCallback& callback,
     functions::HistogramValue histogram_value) {
   base::ListValue empty_list;
   callback.Run(ExtensionFunction::FAILED, empty_list,
                "Access to extension API denied.", histogram_value);
 }
 
 }  // namespace extensions