Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/child/indexed_db/indexed_db_dispatcher.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/child/indexed_db/indexed_db_dispatcher.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_local.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "content/child/indexed_db/webidbcursor_impl.h"
 #include "content/child/indexed_db/webidbdatabase_impl.h"
 #include "content/child/thread_safe_sender.h"
@@ skipping 102 matching lines @@
   DCHECK(handled) << "Didn't handle a message defined at line "
                   << IPC_MESSAGE_ID_LINE(msg.type());
 }
 
 bool IndexedDBDispatcher::Send(IPC::Message* msg) {
   return thread_safe_sender_->Send(msg);
 }
 
 int32_t IndexedDBDispatcher::RegisterObserver(
     std::unique_ptr<WebIDBObserver> observer) {
-  return observers_.Add(observer.release());
+  return observers_.Add(std::move(observer));
 }
 
 void IndexedDBDispatcher::RemoveObservers(
     const std::vector<int32_t>& observer_ids_to_remove) {
   for (int32_t id : observer_ids_to_remove)
     observers_.Remove(id);
 }
 
 void IndexedDBDispatcher::RequestIDBCursorAdvance(
     unsigned long count,
-    WebIDBCallbacks* callbacks_ptr,
+    std::unique_ptr<WebIDBCallbacks> callbacks_ptr,
     int32_t ipc_cursor_id,
     int64_t transaction_id) {
   // Reset all cursor prefetch caches except for this cursor.
   ResetCursorPrefetchCaches(transaction_id, ipc_cursor_id);
 
-  std::unique_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-
-  int32_t ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
+  int32_t ipc_callbacks_id = pending_callbacks_.Add(std::move(callbacks_ptr));
   Send(new IndexedDBHostMsg_CursorAdvance(
       ipc_cursor_id, CurrentWorkerId(), ipc_callbacks_id, count));
 }
 
 void IndexedDBDispatcher::RequestIDBCursorContinue(
     const IndexedDBKey& key,
     const IndexedDBKey& primary_key,
-    WebIDBCallbacks* callbacks_ptr,
+    std::unique_ptr<WebIDBCallbacks> callbacks_ptr,
     int32_t ipc_cursor_id,
     int64_t transaction_id) {
   // Reset all cursor prefetch caches except for this cursor.
   ResetCursorPrefetchCaches(transaction_id, ipc_cursor_id);
 
-  std::unique_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-
-  int32_t ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
+  int32_t ipc_callbacks_id = pending_callbacks_.Add(std::move(callbacks_ptr));
   Send(new IndexedDBHostMsg_CursorContinue(
       ipc_cursor_id, CurrentWorkerId(), ipc_callbacks_id, key, primary_key));
 }
 
 void IndexedDBDispatcher::RequestIDBCursorPrefetch(
     int n,
-    WebIDBCallbacks* callbacks_ptr,
+    std::unique_ptr<WebIDBCallbacks> callbacks_ptr,
     int32_t ipc_cursor_id) {
-  std::unique_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-
-  int32_t ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
+  int32_t ipc_callbacks_id = pending_callbacks_.Add(std::move(callbacks_ptr));
   Send(new IndexedDBHostMsg_CursorPrefetch(
       ipc_cursor_id, CurrentWorkerId(), ipc_callbacks_id, n));
 }
 
 void IndexedDBDispatcher::RequestIDBCursorPrefetchReset(int used_prefetches,
                                                         int unused_prefetches,
                                                         int32_t ipc_cursor_id) {
   Send(new IndexedDBHostMsg_CursorPrefetchReset(
       ipc_cursor_id, used_prefetches, unused_prefetches));
 }
@@ skipping 172 matching lines @@
   typedef std::map<int32_t, WebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == ipc_exception_cursor_id ||
         i->second->transaction_id() != transaction_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }
 
 }  // namespace content