Migrating tests to use EmbeddedTestServer (misc)

- Moving tests to use EmbeddedTestServer where possible.
- net::test_server::EmbeddedTestServer references to net::EmbeddedTestServer
- Using server.Start() instead of server.InitializeAndWaitUntilReady()
- Renaming test_server() to be spawned_test_server() or embedded_test_server()
- Enabling tests disabled due to SpawnedTestServer compatibility

BUG=496825
TBR=brettw@chromium.org,jochen@chromium.org

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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/components/cronet/android/test/native_test_server.cc b/components/cronet/android/test/native_test_server.cc
index 566421b..aab2d32 100644
--- a/components/cronet/android/test/native_test_server.cc
+++ b/components/cronet/android/test/native_test_server.cc
@@ -54,7 +54,7 @@ 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) {
@@ -201,7 +201,7 @@ jboolean StartNativeTestServer(JNIEnv* env,
   // 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));
@@ -211,7 +211,7 @@ jboolean StartNativeTestServer(JNIEnv* env,
   // 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,