Replace deprecated Android java test annotations

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

Index: net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
diff --git a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
index 239a1edcc497db4fbd683fe063280e12da2f5182..40d7db750a19b836da34f1ff446ed4da0efb2b5d 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
@@ -14,8 +14,8 @@
 
 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;
 
@@ -40,8 +40,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
     }
 
     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) {
@@ -61,8 +60,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
     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();