Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: sync/test/fake_server/android/fake_server_helper_android.cc

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "sync/test/fake_server/android/fake_server_helper_android.h" 5 #include "sync/test/fake_server/android/fake_server_helper_android.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <stddef.h> 8 #include <stddef.h>
9
10 #include <memory>
9 #include <set> 11 #include <set>
10 #include <vector> 12 #include <vector>
11 13
12 #include "base/android/jni_array.h" 14 #include "base/android/jni_array.h"
13 #include "base/android/jni_string.h" 15 #include "base/android/jni_string.h"
14 #include "base/logging.h" 16 #include "base/logging.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "jni/FakeServerHelper_jni.h" 17 #include "jni/FakeServerHelper_jni.h"
17 #include "sync/internal_api/public/base/model_type.h" 18 #include "sync/internal_api/public/base/model_type.h"
18 #include "sync/internal_api/public/network_resources.h" 19 #include "sync/internal_api/public/network_resources.h"
19 #include "sync/protocol/sync.pb.h" 20 #include "sync/protocol/sync.pb.h"
20 #include "sync/test/fake_server/bookmark_entity_builder.h" 21 #include "sync/test/fake_server/bookmark_entity_builder.h"
21 #include "sync/test/fake_server/entity_builder_factory.h" 22 #include "sync/test/fake_server/entity_builder_factory.h"
22 #include "sync/test/fake_server/fake_server.h" 23 #include "sync/test/fake_server/fake_server.h"
23 #include "sync/test/fake_server/fake_server_network_resources.h" 24 #include "sync/test/fake_server/fake_server_network_resources.h"
24 #include "sync/test/fake_server/fake_server_verifier.h" 25 #include "sync/test/fake_server/fake_server_verifier.h"
25 #include "sync/test/fake_server/tombstone_entity.h" 26 #include "sync/test/fake_server/tombstone_entity.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 void FakeServerHelperAndroid::ModifyBookmarkEntity( 218 void FakeServerHelperAndroid::ModifyBookmarkEntity(
218 JNIEnv* env, 219 JNIEnv* env,
219 const JavaParamRef<jobject>& obj, 220 const JavaParamRef<jobject>& obj,
220 jlong fake_server, 221 jlong fake_server,
221 const JavaParamRef<jstring>& entity_id, 222 const JavaParamRef<jstring>& entity_id,
222 const JavaParamRef<jstring>& title, 223 const JavaParamRef<jstring>& title,
223 const JavaParamRef<jstring>& url, 224 const JavaParamRef<jstring>& url,
224 const JavaParamRef<jstring>& parent_id) { 225 const JavaParamRef<jstring>& parent_id) {
225 fake_server::FakeServer* fake_server_ptr = 226 fake_server::FakeServer* fake_server_ptr =
226 reinterpret_cast<fake_server::FakeServer*>(fake_server); 227 reinterpret_cast<fake_server::FakeServer*>(fake_server);
227 scoped_ptr<fake_server::FakeServerEntity> bookmark = 228 std::unique_ptr<fake_server::FakeServerEntity> bookmark =
228 CreateBookmarkEntity(env, title, url, parent_id); 229 CreateBookmarkEntity(env, title, url, parent_id);
229 sync_pb::SyncEntity proto; 230 sync_pb::SyncEntity proto;
230 bookmark->SerializeAsProto(&proto); 231 bookmark->SerializeAsProto(&proto);
231 fake_server_ptr->ModifyBookmarkEntity( 232 fake_server_ptr->ModifyBookmarkEntity(
232 base::android::ConvertJavaStringToUTF8(env, entity_id), 233 base::android::ConvertJavaStringToUTF8(env, entity_id),
233 base::android::ConvertJavaStringToUTF8(env, parent_id), 234 base::android::ConvertJavaStringToUTF8(env, parent_id),
234 proto.specifics()); 235 proto.specifics());
235 } 236 }
236 237
237 void FakeServerHelperAndroid::ModifyBookmarkFolderEntity( 238 void FakeServerHelperAndroid::ModifyBookmarkFolderEntity(
(...skipping 14 matching lines...) Expand all
252 base::android::ConvertJavaStringToUTF8(env, parent_id)); 253 base::android::ConvertJavaStringToUTF8(env, parent_id));
253 254
254 sync_pb::SyncEntity proto; 255 sync_pb::SyncEntity proto;
255 bookmark_builder.BuildFolder()->SerializeAsProto(&proto); 256 bookmark_builder.BuildFolder()->SerializeAsProto(&proto);
256 fake_server_ptr->ModifyBookmarkEntity( 257 fake_server_ptr->ModifyBookmarkEntity(
257 base::android::ConvertJavaStringToUTF8(env, entity_id), 258 base::android::ConvertJavaStringToUTF8(env, entity_id),
258 base::android::ConvertJavaStringToUTF8(env, parent_id), 259 base::android::ConvertJavaStringToUTF8(env, parent_id),
259 proto.specifics()); 260 proto.specifics());
260 } 261 }
261 262
262 scoped_ptr<fake_server::FakeServerEntity> 263 std::unique_ptr<fake_server::FakeServerEntity>
263 FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env, 264 FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env,
264 jstring title, 265 jstring title,
265 jstring url, 266 jstring url,
266 jstring parent_id) { 267 jstring parent_id) {
267 std::string url_as_string = base::android::ConvertJavaStringToUTF8(env, url); 268 std::string url_as_string = base::android::ConvertJavaStringToUTF8(env, url);
268 GURL gurl = GURL(url_as_string); 269 GURL gurl = GURL(url_as_string);
269 if (!gurl.is_valid()) { 270 if (!gurl.is_valid()) {
270 NOTREACHED() << "The given string (" << url_as_string 271 NOTREACHED() << "The given string (" << url_as_string
271 << ") is not a valid URL."; 272 << ") is not a valid URL.";
272 } 273 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 jlong fake_server) { 308 jlong fake_server) {
308 fake_server::FakeServer* fake_server_ptr = 309 fake_server::FakeServer* fake_server_ptr =
309 reinterpret_cast<fake_server::FakeServer*>(fake_server); 310 reinterpret_cast<fake_server::FakeServer*>(fake_server);
310 fake_server_ptr->ClearServerData(); 311 fake_server_ptr->ClearServerData();
311 } 312 }
312 313
313 // static 314 // static
314 bool FakeServerHelperAndroid::Register(JNIEnv* env) { 315 bool FakeServerHelperAndroid::Register(JNIEnv* env) {
315 return RegisterNativesImpl(env); 316 return RegisterNativesImpl(env);
316 } 317 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698