OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/gcm_driver/instance_id/instance_id_android.h" | 5 #include "components/gcm_driver/instance_id/instance_id_android.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 InstanceIDAndroid::~InstanceIDAndroid() { | 72 InstanceIDAndroid::~InstanceIDAndroid() { |
73 DCHECK(thread_checker_.CalledOnValidThread()); | 73 DCHECK(thread_checker_.CalledOnValidThread()); |
74 | 74 |
75 JNIEnv* env = AttachCurrentThread(); | 75 JNIEnv* env = AttachCurrentThread(); |
76 Java_InstanceIDBridge_destroy(env, java_ref_); | 76 Java_InstanceIDBridge_destroy(env, java_ref_); |
77 } | 77 } |
78 | 78 |
79 void InstanceIDAndroid::GetID(const GetIDCallback& callback) { | 79 void InstanceIDAndroid::GetID(const GetIDCallback& callback) { |
80 DCHECK(thread_checker_.CalledOnValidThread()); | 80 DCHECK(thread_checker_.CalledOnValidThread()); |
81 | 81 |
82 int32_t request_id = get_id_callbacks_.Add(new GetIDCallback(callback)); | 82 int32_t request_id = |
| 83 get_id_callbacks_.Add(base::MakeUnique<GetIDCallback>(callback)); |
83 | 84 |
84 JNIEnv* env = AttachCurrentThread(); | 85 JNIEnv* env = AttachCurrentThread(); |
85 Java_InstanceIDBridge_getId(env, java_ref_, request_id); | 86 Java_InstanceIDBridge_getId(env, java_ref_, request_id); |
86 } | 87 } |
87 | 88 |
88 void InstanceIDAndroid::GetCreationTime( | 89 void InstanceIDAndroid::GetCreationTime( |
89 const GetCreationTimeCallback& callback) { | 90 const GetCreationTimeCallback& callback) { |
90 DCHECK(thread_checker_.CalledOnValidThread()); | 91 DCHECK(thread_checker_.CalledOnValidThread()); |
91 | 92 |
92 int32_t request_id = | 93 int32_t request_id = get_creation_time_callbacks_.Add( |
93 get_creation_time_callbacks_.Add(new GetCreationTimeCallback(callback)); | 94 base::MakeUnique<GetCreationTimeCallback>(callback)); |
94 | 95 |
95 JNIEnv* env = AttachCurrentThread(); | 96 JNIEnv* env = AttachCurrentThread(); |
96 Java_InstanceIDBridge_getCreationTime(env, java_ref_, request_id); | 97 Java_InstanceIDBridge_getCreationTime(env, java_ref_, request_id); |
97 } | 98 } |
98 | 99 |
99 void InstanceIDAndroid::GetToken( | 100 void InstanceIDAndroid::GetToken( |
100 const std::string& authorized_entity, | 101 const std::string& authorized_entity, |
101 const std::string& scope, | 102 const std::string& scope, |
102 const std::map<std::string, std::string>& options, | 103 const std::map<std::string, std::string>& options, |
103 const GetTokenCallback& callback) { | 104 const GetTokenCallback& callback) { |
104 DCHECK(thread_checker_.CalledOnValidThread()); | 105 DCHECK(thread_checker_.CalledOnValidThread()); |
105 | 106 |
106 int32_t request_id = get_token_callbacks_.Add(new GetTokenCallback(callback)); | 107 int32_t request_id = |
| 108 get_token_callbacks_.Add(base::MakeUnique<GetTokenCallback>(callback)); |
107 | 109 |
108 std::vector<std::string> options_strings; | 110 std::vector<std::string> options_strings; |
109 for (const auto& entry : options) { | 111 for (const auto& entry : options) { |
110 options_strings.push_back(entry.first); | 112 options_strings.push_back(entry.first); |
111 options_strings.push_back(entry.second); | 113 options_strings.push_back(entry.second); |
112 } | 114 } |
113 | 115 |
114 JNIEnv* env = AttachCurrentThread(); | 116 JNIEnv* env = AttachCurrentThread(); |
115 Java_InstanceIDBridge_getToken( | 117 Java_InstanceIDBridge_getToken( |
116 env, java_ref_, request_id, | 118 env, java_ref_, request_id, |
117 ConvertUTF8ToJavaString(env, authorized_entity), | 119 ConvertUTF8ToJavaString(env, authorized_entity), |
118 ConvertUTF8ToJavaString(env, scope), | 120 ConvertUTF8ToJavaString(env, scope), |
119 base::android::ToJavaArrayOfStrings(env, options_strings)); | 121 base::android::ToJavaArrayOfStrings(env, options_strings)); |
120 } | 122 } |
121 | 123 |
122 void InstanceIDAndroid::DeleteTokenImpl(const std::string& authorized_entity, | 124 void InstanceIDAndroid::DeleteTokenImpl(const std::string& authorized_entity, |
123 const std::string& scope, | 125 const std::string& scope, |
124 const DeleteTokenCallback& callback) { | 126 const DeleteTokenCallback& callback) { |
125 DCHECK(thread_checker_.CalledOnValidThread()); | 127 DCHECK(thread_checker_.CalledOnValidThread()); |
126 | 128 |
127 int32_t request_id = | 129 int32_t request_id = delete_token_callbacks_.Add( |
128 delete_token_callbacks_.Add(new DeleteTokenCallback(callback)); | 130 base::MakeUnique<DeleteTokenCallback>(callback)); |
129 | 131 |
130 JNIEnv* env = AttachCurrentThread(); | 132 JNIEnv* env = AttachCurrentThread(); |
131 Java_InstanceIDBridge_deleteToken( | 133 Java_InstanceIDBridge_deleteToken( |
132 env, java_ref_, request_id, | 134 env, java_ref_, request_id, |
133 ConvertUTF8ToJavaString(env, authorized_entity), | 135 ConvertUTF8ToJavaString(env, authorized_entity), |
134 ConvertUTF8ToJavaString(env, scope)); | 136 ConvertUTF8ToJavaString(env, scope)); |
135 } | 137 } |
136 | 138 |
137 void InstanceIDAndroid::DeleteIDImpl(const DeleteIDCallback& callback) { | 139 void InstanceIDAndroid::DeleteIDImpl(const DeleteIDCallback& callback) { |
138 DCHECK(thread_checker_.CalledOnValidThread()); | 140 DCHECK(thread_checker_.CalledOnValidThread()); |
139 | 141 |
140 int32_t request_id = delete_id_callbacks_.Add(new DeleteIDCallback(callback)); | 142 int32_t request_id = delete_id_callbacks_.Add( |
| 143 base::MakeUnique<DeleteIDCallback>(DeleteIDCallback(callback))); |
141 | 144 |
142 JNIEnv* env = AttachCurrentThread(); | 145 JNIEnv* env = AttachCurrentThread(); |
143 Java_InstanceIDBridge_deleteInstanceID(env, java_ref_, request_id); | 146 Java_InstanceIDBridge_deleteInstanceID(env, java_ref_, request_id); |
144 } | 147 } |
145 | 148 |
146 void InstanceIDAndroid::DidGetID( | 149 void InstanceIDAndroid::DidGetID( |
147 JNIEnv* env, | 150 JNIEnv* env, |
148 const base::android::JavaParamRef<jobject>& obj, | 151 const base::android::JavaParamRef<jobject>& obj, |
149 jint request_id, | 152 jint request_id, |
150 const base::android::JavaParamRef<jstring>& jid) { | 153 const base::android::JavaParamRef<jstring>& jid) { |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 jboolean success) { | 216 jboolean success) { |
214 DCHECK(thread_checker_.CalledOnValidThread()); | 217 DCHECK(thread_checker_.CalledOnValidThread()); |
215 | 218 |
216 DeleteIDCallback* callback = delete_id_callbacks_.Lookup(request_id); | 219 DeleteIDCallback* callback = delete_id_callbacks_.Lookup(request_id); |
217 DCHECK(callback); | 220 DCHECK(callback); |
218 callback->Run(success ? InstanceID::SUCCESS : InstanceID::UNKNOWN_ERROR); | 221 callback->Run(success ? InstanceID::SUCCESS : InstanceID::UNKNOWN_ERROR); |
219 delete_id_callbacks_.Remove(request_id); | 222 delete_id_callbacks_.Remove(request_id); |
220 } | 223 } |
221 | 224 |
222 } // namespace instance_id | 225 } // namespace instance_id |
OLD | NEW |