[Cronet] Rename UploadTestServer.java to NativeTestServer.java

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

Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/CronetHttpURLStreamHandlerTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/CronetHttpURLStreamHandlerTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/CronetHttpURLStreamHandlerTest.java
index 201a23eb4006aaceb16bfa96406d94acbc576c93..0591ac0e5a0e89118db532acc1685dbbb416f8f7 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/CronetHttpURLStreamHandlerTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/CronetHttpURLStreamHandlerTest.java
@@ -9,7 +9,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.cronet_test_apk.CronetTestActivity;
 import org.chromium.cronet_test_apk.CronetTestBase;
-import org.chromium.cronet_test_apk.UploadTestServer;
+import org.chromium.cronet_test_apk.NativeTestServer;
 import org.chromium.net.urlconnection.CronetHttpURLStreamHandler;
 
 import java.io.ByteArrayOutputStream;
@@ -26,20 +26,20 @@ public class CronetHttpURLStreamHandlerTest extends CronetTestBase {
     protected void setUp() throws Exception {
         super.setUp();
         mActivity = launchCronetTestApp();
-        assertTrue(UploadTestServer.startUploadTestServer(
+        assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
     }
 
     @Override
     protected void tearDown() throws Exception {
-        UploadTestServer.shutdownUploadTestServer();
+        NativeTestServer.shutdownNativeTestServer();
         super.tearDown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testOpenConnectionHttp() throws Exception {
-        URL url = new URL(UploadTestServer.getEchoMethodURL());
+        URL url = new URL(NativeTestServer.getEchoMethodURL());
         CronetHttpURLStreamHandler streamHandler =
                 new CronetHttpURLStreamHandler(mActivity.mUrlRequestContext);
         HttpURLConnection connection =
@@ -78,7 +78,7 @@ public class CronetHttpURLStreamHandlerTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testOpenConnectionWithProxy() throws Exception {
-        URL url = new URL(UploadTestServer.getEchoMethodURL());
+        URL url = new URL(NativeTestServer.getEchoMethodURL());
         CronetHttpURLStreamHandler streamHandler =
                 new CronetHttpURLStreamHandler(mActivity.mUrlRequestContext);
         Proxy proxy = new Proxy(Proxy.Type.HTTP,