Changes "Android-WebView" feature annotation to "WebView".

We wanted the Android feature annotations to match the features in crbug.
Since the WebView feature was recently added to crbug, this CL updates all
tests using the "Android-WebView" feature annotation to use "WebView" instead.

BUG=

Review URL: https://codereview.chromium.org/11231084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165432 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 17 deletions

diff --git a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
index c93e9ce..25b7c63 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
@@ -77,7 +77,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testNoProxy() throws Exception {
         checkMapping("ftp://example.com/", "DIRECT");
         checkMapping("http://example.com/", "DIRECT");
@@ -90,7 +90,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpProxyHostAndPort() throws Exception {
         System.setProperty("http.proxyHost", "httpproxy.com");
         System.setProperty("http.proxyPort", "8080");
@@ -105,7 +105,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpProxyHostOnly() throws Exception {
         System.setProperty("http.proxyHost", "httpproxy.com");
         checkMapping("ftp://example.com/", "DIRECT");
@@ -119,7 +119,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpProxyPortOnly() throws Exception {
         System.setProperty("http.proxyPort", "8080");
         checkMapping("ftp://example.com/", "DIRECT");
@@ -133,7 +133,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpNonProxyHosts1() throws Exception {
         System.setProperty("http.nonProxyHosts", "slashdot.org");
         System.setProperty("http.proxyHost", "httpproxy.com");
@@ -148,7 +148,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpNonProxyHosts2() throws Exception {
         System.setProperty("http.nonProxyHosts", "slashdot.org|freecode.net");
         System.setProperty("http.proxyHost", "httpproxy.com");
@@ -164,7 +164,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpNonProxyHosts3() throws Exception {
         System.setProperty("http.nonProxyHosts", "*example.com");
         System.setProperty("http.proxyHost", "httpproxy.com");
@@ -180,7 +180,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testFtpNonProxyHosts() throws Exception {
         System.setProperty("ftp.nonProxyHosts", "slashdot.org");
         System.setProperty("ftp.proxyHost", "httpproxy.com");
@@ -195,7 +195,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testFtpProxyHostAndPort() throws Exception {
         System.setProperty("ftp.proxyHost", "httpproxy.com");
         System.setProperty("ftp.proxyPort", "8080");
@@ -210,7 +210,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testFtpProxyHostOnly() throws Exception {
         System.setProperty("ftp.proxyHost", "httpproxy.com");
         checkMapping("ftp://example.com/", "PROXY httpproxy.com:80");
@@ -224,7 +224,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpsProxyHostAndPort() throws Exception {
         System.setProperty("https.proxyHost", "httpproxy.com");
         System.setProperty("https.proxyPort", "8080");
@@ -239,7 +239,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpsProxyHostOnly() throws Exception {
         System.setProperty("https.proxyHost", "httpproxy.com");
         checkMapping("ftp://example.com/", "DIRECT");
@@ -253,7 +253,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDefaultProxyExplictPort() throws Exception {
         System.setProperty("ftp.proxyHost", "httpproxy.com");
         System.setProperty("ftp.proxyPort", "8080");
@@ -270,7 +270,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDefaultProxyDefaultPort() throws Exception {
         System.setProperty("proxyHost", "defaultproxy.com");
         checkMapping("http://example.com/", "PROXY defaultproxy.com:80");
@@ -283,7 +283,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testFallbackToSocks() throws Exception {
         System.setProperty("http.proxyHost", "defaultproxy.com");
         System.setProperty("socksProxyHost", "socksproxy.com");
@@ -298,7 +298,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testSocksExplicitPort() throws Exception {
         System.setProperty("socksProxyHost", "socksproxy.com");
         System.setProperty("socksProxyPort", "9000");
@@ -311,7 +311,7 @@ public class AndroidProxySelectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHttpProxySupercedesSocks() throws Exception {
         System.setProperty("proxyHost", "defaultproxy.com");
         System.setProperty("socksProxyHost", "socksproxy.com");