Revert of [Cronet] Get Cronet performance test running again

components/cronet/android/test/quic_test_server.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 "quic_test_server.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/threading/thread.h"
-#include "components/cronet/android/test/cronet_test_util.h"
 #include "jni/QuicTestServer_jni.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 #include "net/base/test_data_directory.h"
 #include "net/quic/crypto/proof_source_chromium.h"
 #include "net/tools/quic/quic_in_memory_cache.h"
 #include "net/tools/quic/quic_simple_server.h"
 
 namespace cronet {
 
 namespace {
 
+static const char kServerHost[] = "test.example.com";
 static const int kServerPort = 6121;
 
 base::Thread* g_quic_server_thread = nullptr;
 net::tools::QuicSimpleServer* g_quic_server = nullptr;
 
 void StartOnServerThread(const base::FilePath& test_files_root) {
   DCHECK(g_quic_server_thread->task_runner()->BelongsToCurrentThread());
   DCHECK(!g_quic_server);
 
   // Set up in-memory cache.
   base::FilePath file_dir = test_files_root.Append("quic_data");
   CHECK(base::PathExists(file_dir)) << "Quic data does not exist";
   net::tools::QuicInMemoryCache::GetInstance()->InitializeFromDirectory(
       file_dir.value());
   net::IPAddressNumber ip;
-  net::ParseIPLiteralToNumber(kFakeQuicDomain, &ip);
+  net::ParseIPLiteralToNumber(kServerHost, &ip);
   net::QuicConfig config;
 
   // Set up server certs.
   base::FilePath directory;
   CHECK(base::android::GetExternalStorageDirectory(&directory));
   directory = directory.Append("net/data/ssl/certificates");
   // TODO(xunjieli): Use scoped_ptr when crbug.com/545474 is fixed.
   net::ProofSourceChromium* proof_source = new net::ProofSourceChromium();
   CHECK(proof_source->Initialize(
       directory.Append("quic_test.example.com.crt"),
@@ skipping 38 matching lines @@
                             const JavaParamRef<jclass>& /*jcaller*/) {
   DCHECK(!g_quic_server_thread->task_runner()->BelongsToCurrentThread());
   g_quic_server_thread->task_runner()->PostTask(
       FROM_HERE, base::Bind(&ShutdownOnServerThread));
   delete g_quic_server_thread;
 }
 
 ScopedJavaLocalRef<jstring> GetServerHost(
     JNIEnv* env,
     const JavaParamRef<jclass>& /*jcaller*/) {
-  return base::android::ConvertUTF8ToJavaString(env, kFakeQuicDomain);
+  return base::android::ConvertUTF8ToJavaString(env, kServerHost);
 }
 
 int GetServerPort(JNIEnv* env, const JavaParamRef<jclass>& /*jcaller*/) {
   return kServerPort;
 }
 
 bool RegisterQuicTestServer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace cronet