[Cronet] Rename UploadTestServer.java to NativeTestServer.java

components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java

Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
index 9908acec0b3619f70f0a93570bbc09f4ebddbcf4..f907d91fb4a2141544df52215c575736ea6dfe18 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
@@ -83,11 +83,11 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         };
         mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(TEST_URL,
                 commandLineArgs);
-        assertTrue(UploadTestServer.startUploadTestServer(
+        assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
         TestUrlRequestListener listener = new TestUrlRequestListener();
         UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
-                UploadTestServer.getEchoHeaderURL(userAgentName), listener,
+                NativeTestServer.getEchoHeaderURL(userAgentName), listener,
                 listener.getExecutor());
         urlRequest.start();
         listener.blockForDone();
@@ -292,7 +292,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         };
         mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(null,
                 commandLineArgs);
-        assertTrue(UploadTestServer.startUploadTestServer(
+        assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
     }
 
@@ -310,7 +310,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @Feature({"Cronet"})
     public void testEnableHttpCacheDisabled() throws Exception {
         enableCache(UrlRequestContextConfig.HttpCache.DISABLED);
-        String url = UploadTestServer.getFileURL("/cacheable.txt");
+        String url = NativeTestServer.getFileURL("/cacheable.txt");
         checkRequestCaching(url, false);
         checkRequestCaching(url, false);
         checkRequestCaching(url, false);
@@ -320,10 +320,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @Feature({"Cronet"})
     public void testEnableHttpCacheInMemory() throws Exception {
         enableCache(UrlRequestContextConfig.HttpCache.IN_MEMORY);
-        String url = UploadTestServer.getFileURL("/cacheable.txt");
+        String url = NativeTestServer.getFileURL("/cacheable.txt");
         checkRequestCaching(url, false);
         checkRequestCaching(url, true);
-        UploadTestServer.shutdownUploadTestServer();
+        NativeTestServer.shutdownNativeTestServer();
         checkRequestCaching(url, true);
     }
 
@@ -331,10 +331,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @Feature({"Cronet"})
     public void testEnableHttpCacheDisk() throws Exception {
         enableCache(UrlRequestContextConfig.HttpCache.DISK);
-        String url = UploadTestServer.getFileURL("/cacheable.txt");
+        String url = NativeTestServer.getFileURL("/cacheable.txt");
         checkRequestCaching(url, false);
         checkRequestCaching(url, true);
-        UploadTestServer.shutdownUploadTestServer();
+        NativeTestServer.shutdownNativeTestServer();
         checkRequestCaching(url, true);
     }
 
@@ -342,7 +342,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @Feature({"Cronet"})
     public void testEnableHttpCacheDiskNoHttp() throws Exception {
         enableCache(UrlRequestContextConfig.HttpCache.DISABLED);
-        String url = UploadTestServer.getFileURL("/cacheable.txt");
+        String url = NativeTestServer.getFileURL("/cacheable.txt");
         checkRequestCaching(url, false);
         checkRequestCaching(url, false);
         checkRequestCaching(url, false);
@@ -363,12 +363,12 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         };
         mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(null,
                 commandLineArgs);
-        assertTrue(UploadTestServer.startUploadTestServer(
+        assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
-        String url = UploadTestServer.getFileURL("/cacheable.txt");
+        String url = NativeTestServer.getFileURL("/cacheable.txt");
         checkRequestCaching(url, false);
         checkRequestCaching(url, true);
-        UploadTestServer.shutdownUploadTestServer();
+        NativeTestServer.shutdownNativeTestServer();
         checkRequestCaching(url, true);
         // Shutdown original context and create another that uses the same cache.
         mActivity.mUrlRequestContext.shutdown();