Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

net/test/embedded_test_server/android/embedded_test_server_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/embedded_test_server/android/embedded_test_server_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/trace_event/trace_event.h"
-#include "net/test/jni/EmbeddedTestServerImpl_jni.h"
+#include "net/test/jni/EmbeddedTestServer_jni.h"
 
 namespace net {
 namespace test_server {
 
 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj)
     : weak_java_server_(env, jobj), test_server_() {
-  Java_EmbeddedTestServerImpl_setNativePtr(env, jobj,
-                                           reinterpret_cast<intptr_t>(this));
+  Java_EmbeddedTestServer_setNativePtr(env, jobj,
+                                       reinterpret_cast<intptr_t>(this));
 }
 
 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_EmbeddedTestServerImpl_clearNativePtr(env,
-                                             weak_java_server_.get(env).obj());
+  Java_EmbeddedTestServer_clearNativePtr(env, weak_java_server_.get(env).obj());
 }
 
 jboolean EmbeddedTestServerAndroid::Start(JNIEnv* env,
                                           const JavaParamRef<jobject>& jobj) {
   return test_server_.Start();
 }
 
 jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj) {
@@ skipping 28 matching lines @@
   new EmbeddedTestServerAndroid(env, jobj);
 }
 
 // static
 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace test_server
 }  // namespace net