Migrating tests to use EmbeddedTestServer (misc)

components/cronet/android/test/native_test_server.cc

 // Copyright 2014 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 "native_test_server.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 36 matching lines @@
 const char kFakeQuicDomain[] = "test.example.com";
 // Path that advertises the dictionary passed in query params if client
 // supports Sdch encoding. E.g. /sdch/index?q=LeQxM80O will make the server
 // responds with "Get-Dictionary: /sdch/dict/LeQxM80O".
 const char kSdchPath[] = "/sdch/index";
 // Path that returns encoded response if client has the right dictionary.
 const char kSdchTestPath[] = "/sdch/test";
 // Path where dictionaries are stored.
 const char kSdchDictPath[] = "/sdch/dict/";
 
-net::test_server::EmbeddedTestServer* g_test_server = nullptr;
+net::EmbeddedTestServer* g_test_server = nullptr;
 
 scoped_ptr<net::test_server::RawHttpResponse> ConstructResponseBasedOnFile(
     const base::FilePath& file_path) {
   std::string file_contents;
   bool read_file = base::ReadFileToString(file_path, &file_contents);
   DCHECK(read_file);
   base::FilePath headers_path(
       file_path.AddExtension(FILE_PATH_LITERAL("mock-http-headers")));
   std::string headers_contents;
   bool read_headers = base::ReadFileToString(headers_path, &headers_contents);
@@ skipping 126 matching lines @@
 }
 
 }  // namespace
 
 jboolean StartNativeTestServer(JNIEnv* env,
                                const JavaParamRef<jclass>& jcaller,
                                const JavaParamRef<jstring>& jtest_files_root) {
   // Shouldn't happen.
   if (g_test_server)
     return false;
-  g_test_server = new net::test_server::EmbeddedTestServer();
+  g_test_server = new net::EmbeddedTestServer();
   g_test_server->RegisterRequestHandler(
       base::Bind(&NativeTestServerRequestHandler));
   g_test_server->RegisterRequestHandler(base::Bind(&SdchRequestHandler));
   base::FilePath test_files_root(
       base::android::ConvertJavaStringToUTF8(env, jtest_files_root));
 
   // Add a third handler for paths that NativeTestServerRequestHandler does not
   // handle.
   g_test_server->ServeFilesFromDirectory(test_files_root);
-  return g_test_server->InitializeAndWaitUntilReady();
+  return g_test_server->Start();
 }
 
 void RegisterHostResolverProc(JNIEnv* env,
                               const JavaParamRef<jclass>& jcaller,
                               jlong jadapter,
                               jboolean jlegacy_api) {
   if (jlegacy_api == JNI_TRUE) {
     URLRequestContextAdapter* context_adapter =
         reinterpret_cast<URLRequestContextAdapter*>(jadapter);
     context_adapter->PostTaskToNetworkThread(
@@ skipping 94 matching lines @@
 #else
   return JNI_FALSE;
 #endif
 }
 
 bool RegisterNativeTestServer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace cronet