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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 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
« no previous file with comments | « sync/BUILD.gn ('k') | sync/test/fake_server/android/fake_server_helper_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID 5 #ifndef SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID
6 #define SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID 6 #define SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h"
11 #include "base/basictypes.h" 10 #include "base/basictypes.h"
12 #include "sync/test/fake_server/entity_builder_factory.h" 11 #include "sync/test/fake_server/entity_builder_factory.h"
13 12
14 // Helper for utilizing native FakeServer infrastructure in Android tests. 13 // Helper for utilizing native FakeServer infrastructure in Android tests.
15 class FakeServerHelperAndroid { 14 class FakeServerHelperAndroid {
16 public: 15 public:
17 // Registers the native methods. 16 // Registers the native methods.
18 static bool Register(JNIEnv* env); 17 static bool Register(JNIEnv* env);
19 18
20 // Creates a FakeServerHelperAndroid. 19 // Creates a FakeServerHelperAndroid.
(...skipping 20 matching lines...) Expand all
41 jstring model_type_string, 40 jstring model_type_string,
42 jstring name); 41 jstring name);
43 42
44 // Injects a UniqueClientEntity into |fake_server|. 43 // Injects a UniqueClientEntity into |fake_server|.
45 void InjectUniqueClientEntity(JNIEnv* env, 44 void InjectUniqueClientEntity(JNIEnv* env,
46 jobject obj, 45 jobject obj,
47 jlong fake_server, 46 jlong fake_server,
48 jstring name, 47 jstring name,
49 jbyteArray serialized_entity_specifics); 48 jbyteArray serialized_entity_specifics);
50 49
51 // Injects a BookmarkEntity into |fake_server|.
52 void InjectBookmarkEntity(JNIEnv* env,
53 jobject obj,
54 jlong fake_server,
55 jstring title,
56 jstring url,
57 jstring parent_id);
58
59 // Returns the bookmark bar folder ID.
60 base::android::ScopedJavaLocalRef<jstring> GetBookmarkBarFolderId(
61 JNIEnv* env,
62 jobject obj,
63 jlong fake_server);
64
65 private: 50 private:
66 virtual ~FakeServerHelperAndroid(); 51 virtual ~FakeServerHelperAndroid();
67 }; 52 };
68 53
69 #endif // SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID 54 #endif // SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID
OLDNEW
« no previous file with comments | « sync/BUILD.gn ('k') | sync/test/fake_server/android/fake_server_helper_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698