Part 2 of base::IDMap refactor to eliminate IDMapOwnPointer/IDMapExternalPointer modes

components/gcm_driver/instance_id/instance_id_android.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_
 
 #include <jni.h>
 
 #include <map>
@@ skipping 62 matching lines @@
                       jint request_id,
                       jboolean success);
   void DidDeleteID(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
                    jint request_id,
                    jboolean success);
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
-  IDMap<GetIDCallback, IDMapOwnPointer> get_id_callbacks_;
-  IDMap<GetCreationTimeCallback, IDMapOwnPointer> get_creation_time_callbacks_;
-  IDMap<GetTokenCallback, IDMapOwnPointer> get_token_callbacks_;
-  IDMap<DeleteTokenCallback, IDMapOwnPointer> delete_token_callbacks_;
-  IDMap<DeleteIDCallback, IDMapOwnPointer> delete_id_callbacks_;
+  IDMap<std::unique_ptr<GetIDCallback>> get_id_callbacks_;
+  IDMap<std::unique_ptr<GetCreationTimeCallback>> get_creation_time_callbacks_;
+  IDMap<std::unique_ptr<GetTokenCallback>> get_token_callbacks_;
+  IDMap<std::unique_ptr<DeleteTokenCallback>> delete_token_callbacks_;
+  IDMap<std::unique_ptr<DeleteIDCallback>> delete_id_callbacks_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceIDAndroid);
 };
 
 }  // namespace instance_id
 
 #endif  // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_ANDROID_H_