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

Unified Diff: sync/test/fake_server/android/fake_server_helper_android.cc

Issue 881753003: Revert of Create a Android Sync integration test for typed URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/test/fake_server/android/fake_server_helper_android.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/fake_server/android/fake_server_helper_android.cc
diff --git a/sync/test/fake_server/android/fake_server_helper_android.cc b/sync/test/fake_server/android/fake_server_helper_android.cc
index 8491474b82cdfe3205a2047367310cef86cb2bff..725ba639cefdf8151c311e2e472f8891569a43e5 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -6,17 +6,11 @@
#include <jni.h>
-#include "base/android/jni_string.h"
#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.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/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 "testing/gtest/include/gtest/gtest.h"
FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {
}
@@ -52,32 +46,6 @@
delete fake_server_ptr;
}
-jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName(
- JNIEnv* env,
- jobject obj,
- jlong fake_server,
- jlong count,
- jstring model_type_string,
- jstring name) {
- syncer::ModelType model_type;
- if (!NotificationTypeToRealModelType(base::android::ConvertJavaStringToUTF8(
- env, model_type_string), &model_type)) {
- LOG(WARNING) << "Invalid ModelType string.";
- return false;
- }
- fake_server::FakeServer* fake_server_ptr =
- reinterpret_cast<fake_server::FakeServer*>(fake_server);
- fake_server::FakeServerVerifier fake_server_verifier(fake_server_ptr);
- testing::AssertionResult result =
- fake_server_verifier.VerifyEntityCountByTypeAndName(
- count, model_type, base::android::ConvertJavaStringToUTF8(env, name));
-
- if (!result)
- LOG(WARNING) << result.message();
-
- return result;
-}
-
// static
bool FakeServerHelperAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
« no previous file with comments | « sync/test/fake_server/android/fake_server_helper_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698