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

components/gcm_driver/instance_id/instance_id_android.h

Index: components/gcm_driver/instance_id/instance_id_android.h
diff --git a/components/gcm_driver/instance_id/instance_id_android.h b/components/gcm_driver/instance_id/instance_id_android.h
index 57760e38d79ee139fa827236accf9eb7a687d2f9..44302d03aa39a99cda4b5de3a4ae0ff1fef56ac1 100644
--- a/components/gcm_driver/instance_id/instance_id_android.h
+++ b/components/gcm_driver/instance_id/instance_id_android.h
@@ -80,11 +80,11 @@ class InstanceIDAndroid : public InstanceID {
  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_;