Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/child/indexed_db/indexed_db_dispatcher.h

 // 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.
 
 #ifndef CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 112 matching lines @@
   void UnregisterMojoOwnedDatabaseCallbacks(
       blink::WebIDBDatabaseCallbacks* callback_state);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, CursorReset);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, CursorTransactionId);
 
   static int32_t CurrentWorkerId() { return WorkerThread::GetCurrentId(); }
 
   template <typename T>
   void init_params(T* params, blink::WebIDBCallbacks* callbacks_ptr) {

[danakj, 2016/11/18 00:15:33]

could this be a unique_ptr?

[rlanday, 2016/11/18 20:40:41]

It's unclear to me that this function is used anywhere, I can comment it out and
still build all the targets buildable on Linux. I also can't find any calls
using code search. I guess I'll change it to unique_ptr here and put up a
separate changeset to remove it.

-    std::unique_ptr<blink::WebIDBCallbacks> callbacks(callbacks_ptr);
     params->ipc_thread_id = CurrentWorkerId();
-    params->ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
+    params->ipc_callbacks_id = pending_callbacks_.Add(
+        std::unique_ptr<blink::WebIDBCallbacks>(callbacks_ptr));
   }
 
   // IDBCallback message handlers.
   void OnSuccessCursorContinue(
       const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p);
   void OnSuccessCursorPrefetch(
       const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p);
   void OnSuccessValue(const IndexedDBMsg_CallbacksSuccessValue_Params& p);
   void OnSuccessInteger(int32_t ipc_thread_id,
                         int32_t ipc_callbacks_id,
@@ skipping 29 matching lines @@
 
   // Map from cursor id to WebIDBCursorImpl.
   std::map<int32_t, WebIDBCursorImpl*> cursors_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_