Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

components/gcm_driver/instance_id/instance_id_android.cc

 // Copyright 2015 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 "components/gcm_driver/instance_id/instance_id_android.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 61 matching lines @@
 InstanceIDAndroid::~InstanceIDAndroid() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_destroy(env, java_ref_);
 }
 
 void InstanceIDAndroid::GetID(const GetIDCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  int32_t request_id = get_id_callbacks_.Add(new GetIDCallback(callback));
+  int32_t request_id =
+      get_id_callbacks_.Add(base::MakeUnique<GetIDCallback>(callback));
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_getId(env, java_ref_, request_id);
 }
 
 void InstanceIDAndroid::GetCreationTime(
     const GetCreationTimeCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  int32_t request_id =
-      get_creation_time_callbacks_.Add(new GetCreationTimeCallback(callback));
+  int32_t request_id = get_creation_time_callbacks_.Add(
+      base::MakeUnique<GetCreationTimeCallback>(callback));
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_getCreationTime(env, java_ref_, request_id);
 }
 
 void InstanceIDAndroid::GetToken(
     const std::string& authorized_entity,
     const std::string& scope,
     const std::map<std::string, std::string>& options,
     const GetTokenCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  int32_t request_id = get_token_callbacks_.Add(new GetTokenCallback(callback));
+  int32_t request_id =
+      get_token_callbacks_.Add(base::MakeUnique<GetTokenCallback>(callback));
 
   std::vector<std::string> options_strings;
   for (const auto& entry : options) {
     options_strings.push_back(entry.first);
     options_strings.push_back(entry.second);
   }
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_getToken(
       env, java_ref_, request_id,
       ConvertUTF8ToJavaString(env, authorized_entity),
       ConvertUTF8ToJavaString(env, scope),
       base::android::ToJavaArrayOfStrings(env, options_strings));
 }
 
 void InstanceIDAndroid::DeleteTokenImpl(const std::string& authorized_entity,
                                         const std::string& scope,
                                         const DeleteTokenCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  int32_t request_id =
-      delete_token_callbacks_.Add(new DeleteTokenCallback(callback));
+  int32_t request_id = delete_token_callbacks_.Add(
+      base::MakeUnique<DeleteTokenCallback>(callback));
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_deleteToken(
       env, java_ref_, request_id,
       ConvertUTF8ToJavaString(env, authorized_entity),
       ConvertUTF8ToJavaString(env, scope));
 }
 
 void InstanceIDAndroid::DeleteIDImpl(const DeleteIDCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  int32_t request_id = delete_id_callbacks_.Add(new DeleteIDCallback(callback));
+  int32_t request_id = delete_id_callbacks_.Add(
+      base::MakeUnique<DeleteIDCallback>(DeleteIDCallback(callback)));
 
   JNIEnv* env = AttachCurrentThread();
   Java_InstanceIDBridge_deleteInstanceID(env, java_ref_, request_id);
 }
 
 void InstanceIDAndroid::DidGetID(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
     jint request_id,
     const base::android::JavaParamRef<jstring>& jid) {
@@ skipping 62 matching lines @@
     jboolean success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DeleteIDCallback* callback = delete_id_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->Run(success ? InstanceID::SUCCESS : InstanceID::UNKNOWN_ERROR);
   delete_id_callbacks_.Remove(request_id);
 }
 
 }  // namespace instance_id