| 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 70143c5e3521099920c7cf2265c374636de2f2d0..239a1edcc497db4fbd683fe063280e12da2f5182 100644
|
| --- a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
|
| +++ b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -45,13 +45,16 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
|
| // 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://";
|
| + 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://";
|
| }
|
| }
|
|
|
| @@ -63,7 +66,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
|
| builder.append(toString(proxy));
|
| }
|
| return builder.toString();
|
| - }
|
| + }
|
|
|
| static void checkMapping(String url, String expected) throws URISyntaxException {
|
| URI uri = new URI(url);
|
|
|