| Index: components/sync/test/fake_server/android/fake_server_helper_android.cc
|
| diff --git a/sync/test/fake_server/android/fake_server_helper_android.cc b/components/sync/test/fake_server/android/fake_server_helper_android.cc
|
| similarity index 92%
|
| rename from sync/test/fake_server/android/fake_server_helper_android.cc
|
| rename to components/sync/test/fake_server/android/fake_server_helper_android.cc
|
| index c49a65108cbe13da7a16b6940e3546a37a25f821..75801f551fe6bb5bb0f1af4a77834017e94ee99e 100644
|
| --- a/sync/test/fake_server/android/fake_server_helper_android.cc
|
| +++ b/components/sync/test/fake_server/android/fake_server_helper_android.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/test/fake_server/android/fake_server_helper_android.h"
|
| +#include "components/sync/test/fake_server/android/fake_server_helper_android.h"
|
|
|
| #include <jni.h>
|
| #include <stddef.h>
|
| @@ -14,24 +14,23 @@
|
| #include "base/android/jni_array.h"
|
| #include "base/android/jni_string.h"
|
| #include "base/logging.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/core/network_resources.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| +#include "components/sync/test/fake_server/bookmark_entity_builder.h"
|
| +#include "components/sync/test/fake_server/entity_builder_factory.h"
|
| +#include "components/sync/test/fake_server/fake_server.h"
|
| +#include "components/sync/test/fake_server/fake_server_network_resources.h"
|
| +#include "components/sync/test/fake_server/fake_server_verifier.h"
|
| +#include "components/sync/test/fake_server/tombstone_entity.h"
|
| +#include "components/sync/test/fake_server/unique_client_entity.h"
|
| #include "jni/FakeServerHelper_jni.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/network_resources.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| -#include "sync/test/fake_server/bookmark_entity_builder.h"
|
| -#include "sync/test/fake_server/entity_builder_factory.h"
|
| -#include "sync/test/fake_server/fake_server.h"
|
| -#include "sync/test/fake_server/fake_server_network_resources.h"
|
| -#include "sync/test/fake_server/fake_server_verifier.h"
|
| -#include "sync/test/fake_server/tombstone_entity.h"
|
| -#include "sync/test/fake_server/unique_client_entity.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "url/gurl.h"
|
|
|
| -FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {
|
| -}
|
| +FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {}
|
|
|
| -FakeServerHelperAndroid::~FakeServerHelperAndroid() { }
|
| +FakeServerHelperAndroid::~FakeServerHelperAndroid() {}
|
|
|
| static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
|
| FakeServerHelperAndroid* fake_server_android =
|
| @@ -93,7 +92,7 @@ jboolean FakeServerHelperAndroid::VerifySessions(
|
| const JavaParamRef<jobjectArray>& url_array) {
|
| std::multiset<std::string> tab_urls;
|
| for (int i = 0; i < env->GetArrayLength(url_array); i++) {
|
| - jstring s = (jstring) env->GetObjectArrayElement(url_array, i);
|
| + jstring s = (jstring)env->GetObjectArrayElement(url_array, i);
|
| tab_urls.insert(base::android::ConvertJavaStringToUTF8(env, s));
|
| }
|
| fake_server::SessionsHierarchy expected_sessions;
|
| @@ -176,7 +175,7 @@ void FakeServerHelperAndroid::DeserializeEntitySpecifics(
|
| int specifics_bytes_length = env->GetArrayLength(serialized_entity_specifics);
|
| jbyte* specifics_bytes =
|
| env->GetByteArrayElements(serialized_entity_specifics, NULL);
|
| - std::string specifics_string(reinterpret_cast<char *>(specifics_bytes),
|
| + std::string specifics_string(reinterpret_cast<char*>(specifics_bytes),
|
| specifics_bytes_length);
|
|
|
| if (!entity_specifics->ParseFromString(specifics_string))
|
| @@ -277,7 +276,7 @@ FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env,
|
| entity_builder_factory.NewBookmarkEntityBuilder(
|
| base::android::ConvertJavaStringToUTF8(env, title));
|
| bookmark_builder.SetParentId(
|
| - base::android::ConvertJavaStringToUTF8(env, parent_id));
|
| + base::android::ConvertJavaStringToUTF8(env, parent_id));
|
| return bookmark_builder.BuildBookmark(gurl);
|
| }
|
|
|
|
|