Replace deprecated Android java test annotations

net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java

 // Copyright 2012 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.
 
 /**
  * Test suite for Android's default ProxySelector implementation. The purpose of these tests
  * is to check that the behaviour of the ProxySelector implementation matches what we have
  * implemented in net/proxy/proxy_config_service_android.cc.
  *
  * IMPORTANT: These test cases are generated from net/android/tools/proxy_test_cases.py, so if any
  * of these tests fail, please be sure to edit that file and regenerate the test cases here and also
  * in net/proxy/proxy_config_service_android_unittests.cc if required.
  */
 
 package org.chromium.net;
 
+import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 
 import java.net.Proxy;
 import java.net.ProxySelector;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Properties;
 
 public class AndroidProxySelectorTest extends InstrumentationTestCase {
     Properties mProperties;
 
     public AndroidProxySelectorTest() {
         // Start with a clean slate in case there is a system proxy configured.
         mProperties = new Properties();
     }
 
     @Override
     public void setUp() {
         System.setProperties(mProperties);
     }
 
     static String toString(Proxy proxy) {
-        if (proxy == Proxy.NO_PROXY)

[jbudorick, 2016/12/17 02:15:52]

?

[the real yoland, 2016/12/17 03:31:53]

This is presubmit error

[jbudorick, 2016/12/19 13:47:43]

Acknowledged.

-            return "DIRECT";
+        if (proxy == Proxy.NO_PROXY) return "DIRECT";
         // java.net.Proxy only knows about http and socks proxies.
         Proxy.Type type = proxy.type();
         switch (type) {
             case HTTP:
                 return "PROXY " + proxy.address().toString();
             case SOCKS:
                 return "SOCKS5 " + proxy.address().toString();
             case DIRECT:
                 return "DIRECT";
             default:
                 // If a new proxy type is supported in future, add a case to match it.
                 fail("Unknown proxy type" + type);
                 return "unknown://";
         }
     }
 
     static String toString(List<Proxy> proxies) {
         StringBuilder builder = new StringBuilder();
         for (Proxy proxy : proxies) {
-            if (builder.length() > 0)
-                builder.append(';');
+            if (builder.length() > 0) builder.append(';');
             builder.append(toString(proxy));
         }
         return builder.toString();
     }
 
     static void checkMapping(String url, String expected) throws URISyntaxException {
         URI uri = new URI(url);
         List<Proxy> proxies = ProxySelector.getDefault().select(uri);
         assertEquals("Mapping", expected, toString(proxies));
     }
@@ skipping 213 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testHttpProxySupercedesSocks() throws Exception {
         System.setProperty("proxyHost", "defaultproxy.com");
         System.setProperty("socksProxyHost", "socksproxy.com");
         System.setProperty("socksProxyPort", "9000");
         checkMapping("http://example.com/", "PROXY defaultproxy.com:80");
     }
 }