Revert of Create a Android Sync integration test for typed URLs (patchset #4 id:140001 of https://codereview.chromium.org/862113005/)

Reason for revert:
This is breaking building chrome/android:chrome_sync_shell_test_apk
with gn due to a dependency to the autogenerated enum org.chromium.ui.base.PageTransition;

I am not sure why no bots failed when landing it (we don't seem to have gn builder upstream for android?) but reverting it locally makes it build again.

To repro: Reapply the patch and run
gn gen out/Release  --args='is_debug=false os="android" cpu_arch="arm" use_goma=true goma_dir="/usr/local/google/clank/goma/goma"'

ninja -C out/Release -j 200  chrome/android:chrome_sync_shell_test_apk

Original issue's description:
> Create a Android Sync integration test for typed URLs
>
> This CL introduces JNI plumbing for one method of the FakeServer's
> verification API. One test (testUploadTypedUrl) has been added to use
> the API; it types a URL on the client and verifies that the URL was
> sent to the server.
>
> BUG=NONE
>
> Committed: https://crrev.com/cba424b9309c8c75d0a3797b9b228f7ef11425e4
> Cr-Commit-Position: refs/heads/master@{#313824}

TBR=nyquist@chromium.org,maxbogue@chromium.org,zea@chromium.org,pvalenzuela@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=NONE

Review URL: https://codereview.chromium.org/881753003

Cr-Commit-Position: refs/heads/master@{#313898}

4 files changed, 0 insertions, 43 deletions

diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index 605f797..df5f23a 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -804,7 +804,6 @@ if (is_android) {
       ":fake_server_jni",
       ":test_support_sync_fake_server",
       "//base",
-      "//testing/gtest",
     ]
   }
 }
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 1c39e5b..b1ef9cf 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -475,7 +475,6 @@
           'dependencies': [
             'sync_fake_server_jni_headers',
             'test_support_sync_fake_server',
-            '../testing/gtest.gyp:gtest',
             '../base/base.gyp:base',
           ],
           'sources': [
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 8491474..725ba63 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 @@ void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env,
   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);
diff --git a/sync/test/fake_server/android/fake_server_helper_android.h b/sync/test/fake_server/android/fake_server_helper_android.h
index dfbdb7b..24e1d9e 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.h
+++ b/sync/test/fake_server/android/fake_server_helper_android.h
@@ -30,15 +30,6 @@ class FakeServerHelperAndroid {
   // CreateFakeServer).
   void DeleteFakeServer(JNIEnv* env, jobject obj, jlong fake_server);
 
-  // Returns true if and only if |fake_server| contains |count| entities that
-  // match |model_type_string| and |name|.
-  jboolean VerifyEntityCountByTypeAndName(JNIEnv* env,
-                                          jobject obj,
-                                          jlong fake_server,
-                                          jlong count,
-                                          jstring model_type_string,
-                                          jstring name);
-
  private:
   virtual ~FakeServerHelperAndroid();
 };