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

9 files changed, 79 insertions, 79 deletions

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
index ad4f1ad..c292a65 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
@@ -159,7 +159,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGestureSingleClick() throws Exception {
         final long downTime = SystemClock.uptimeMillis();
         final long eventTime = SystemClock.uptimeMillis();
@@ -183,7 +183,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGestureFlingAndCancelLongClick() throws Exception {
         final long downTime = SystemClock.uptimeMillis();
         final long eventTime = SystemClock.uptimeMillis();
@@ -290,7 +290,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
      * and relative position information.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testScrollUpdateCoordinates() {
         final int deltaX = 16;
         final int deltaY = 84;
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
index 494fd18..81c7742 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
@@ -159,7 +159,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript numbers in the int32 range to a
     // method which takes a Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberInt32() throws Throwable {
         executeJavaScript("testObject.setBooleanArray([0]);");
         assertFalse(mTestObject.waitForBooleanArray()[0]);
@@ -205,7 +205,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript numbers in the double range to a
     // method which takes a Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberDouble() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should convert to boolean.
         executeJavaScript("testObject.setBooleanArray([42.1]);");
@@ -250,7 +250,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Java array.
     /*
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
       Bug: http://code.google.com/p/chromium/issues/detail?id=145881
     */
     @DisabledTest
@@ -296,7 +296,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // takes a Java array.
     /*
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
       Bug: http://code.google.com/p/chromium/issues/detail?id=145881
     */
     @DisabledTest
@@ -343,7 +343,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript boolean values to a method which
     // takes a Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassBoolean() throws Throwable {
         executeJavaScript("testObject.setBooleanArray([true]);");
         assertTrue(mTestObject.waitForBooleanArray()[0]);
@@ -408,7 +408,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript strings to a method which takes a
     // Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassString() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Non-empty string should convert to true.
         executeJavaScript("testObject.setBooleanArray([\"+042.10\"]);");
@@ -457,7 +457,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript objects to a method which takes a
     // Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassJavaScriptObject() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
         executeJavaScript("testObject.setBooleanArray([{foo: 42}]);");
@@ -507,7 +507,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of Java objects to a method which takes a Java
     // array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassJavaObject() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
         executeJavaScript("testObject.setBooleanArray([testObject.getObjectInstance()]);");
@@ -559,7 +559,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript null values to a method which takes
     // a Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNull() throws Throwable {
         executeJavaScript("testObject.setByteArray([null]);");
         assertEquals(0, mTestObject.waitForByteArray()[0]);
@@ -600,7 +600,7 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
     // Test passing an array of JavaScript undefined values to a method which
     // takes a Java array.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUndefined() throws Throwable {
         executeJavaScript("testObject.setByteArray([undefined]);");
         assertEquals(0, mTestObject.waitForByteArray()[0]);
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
index 8e732f6..1067a28 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
@@ -93,7 +93,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testArrayLength() throws Throwable {
         executeJavaScript("testObject.setIntArray([42, 43, 44]);");
         int[] result = mTestObject.waitForIntArray();
@@ -104,21 +104,21 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNull() throws Throwable {
         executeJavaScript("testObject.setIntArray(null);");
         assertNull(mTestObject.waitForIntArray());
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUndefined() throws Throwable {
         executeJavaScript("testObject.setIntArray(undefined);");
         assertNull(mTestObject.waitForIntArray());
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassEmptyArray() throws Throwable {
         executeJavaScript("testObject.setIntArray([]);");
         assertEquals(0, mTestObject.waitForIntArray().length);
@@ -127,7 +127,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     // Note that this requires being able to pass a string from JavaScript to
     // Java.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassArrayToStringMethod() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should call toString() on array.
         executeJavaScript("testObject.setStringValue([42, 42, 42]);");
@@ -137,7 +137,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     // Note that this requires being able to pass an integer from JavaScript to
     // Java.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassArrayToNonStringNonArrayMethod() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise JavaScript exception.
         executeJavaScript("testObject.setIntValue([42, 42, 42]);");
@@ -145,7 +145,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNonArrayToArrayMethod() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise JavaScript exception.
         executeJavaScript("testObject.setIntArray(42);");
@@ -153,7 +153,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testObjectWithLengthProperty() throws Throwable {
         executeJavaScript("testObject.setIntArray({length: 3, 1: 42});");
         int[] result = mTestObject.waitForIntArray();
@@ -164,7 +164,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testNonNumericLengthProperty() throws Throwable {
         // LIVECONNECT_COMPLIANCE: This should not count as an array, so we
         // should raise a JavaScript exception.
@@ -173,7 +173,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testLengthOutOfBounds() throws Throwable {
         // LIVECONNECT_COMPLIANCE: This should not count as an array, so we
         // should raise a JavaScript exception.
@@ -194,7 +194,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testSparseArray() throws Throwable {
         executeJavaScript("var x = [42, 43]; x[3] = 45; testObject.setIntArray(x);");
         int[] result = mTestObject.waitForIntArray();
@@ -208,7 +208,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     // Note that this requires being able to pass a boolean from JavaScript to
     // Java.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testMethodReturningArrayNotCalled() throws Throwable {
         // We don't invoke methods which return arrays, but note that no
         // exception is raised.
@@ -220,7 +220,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testMultiDimensionalArrayMethod() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should handle multi-dimensional arrays.
         executeJavaScript("testObject.setIntIntArray([ [42, 43], [44, 45] ]);");
@@ -228,7 +228,7 @@ public class JavaBridgeArrayTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassMultiDimensionalArray() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should handle multi-dimensional arrays.
         executeJavaScript("testObject.setIntArray([ [42, 43], [44, 45] ]);");
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
index c276746..97fed98 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
@@ -117,13 +117,13 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTypeOfInjectedObject() throws Throwable {
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testController"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testAdditionNotReflectedUntilReload() throws Throwable {
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testObject"));
         runTestOnUiThread(new Runnable() {
@@ -148,7 +148,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testRemovalNotReflectedUntilReload() throws Throwable {
         injectObjectAndReload(new Object(), "testObject");
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testObject"));
@@ -173,7 +173,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testRemoveObjectNotAdded() throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
@@ -190,26 +190,26 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTypeOfMethod() throws Throwable {
         assertEquals("function",
                 executeJavaScriptAndGetStringResult("typeof testController.setStringValue"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTypeOfInvalidMethod() throws Throwable {
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testController.foo"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testCallingInvalidMethodRaisesException() throws Throwable {
         assertRaisesException("testController.foo()");
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testUncaughtJavaExceptionRaisesJavaScriptException() throws Throwable {
         injectObjectAndReload(new Object() {
             public void method() { throw new RuntimeException("foo"); }
@@ -219,7 +219,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
 
     // Note that this requires that we can pass a JavaScript string to Java.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTypeOfStaticMethod() throws Throwable {
         injectObjectAndReload(new ObjectWithStaticMethod(), "testObject");
         executeJavaScript("testController.setStringValue(typeof testObject.staticMethod)");
@@ -228,7 +228,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
 
     // Note that this requires that we can pass a JavaScript string to Java.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testCallStaticMethod() throws Throwable {
         injectObjectAndReload(new ObjectWithStaticMethod(), "testObject");
         executeJavaScript("testController.setStringValue(testObject.staticMethod())");
@@ -236,7 +236,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPrivateMethodNotExposed() throws Throwable {
         injectObjectAndReload(new Object() {
             private void method() {}
@@ -249,7 +249,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReplaceInjectedObject() throws Throwable {
         injectObjectAndReload(new Object() {
             public void method() { mTestController.setStringValue("object 1"); }
@@ -265,14 +265,14 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testInjectNullObjectIsIgnored() throws Throwable {
         injectObjectAndReload(null, "testObject");
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testObject"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReplaceInjectedObjectWithNullObjectIsIgnored() throws Throwable {
         injectObjectAndReload(new Object(), "testObject");
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testObject"));
@@ -281,7 +281,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testCallOverloadedMethodWithDifferentNumberOfArguments() throws Throwable {
         injectObjectAndReload(new Object() {
             public void method() { mTestController.setStringValue("0 args"); }
@@ -301,14 +301,14 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testCallMethodWithWrongNumberOfArgumentsRaisesException() throws Throwable {
         assertRaisesException("testController.setIntValue()");
         assertRaisesException("testController.setIntValue(42, 42)");
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testObjectPersistsAcrossPageLoads() throws Throwable {
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testController"));
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
@@ -325,7 +325,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testSameObjectInjectedMultipleTimes() throws Throwable {
         class TestObject {
             private int mNumMethodInvocations;
@@ -353,7 +353,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testCallMethodOnReturnedObject() throws Throwable {
         injectObjectAndReload(new Object() {
             public Object getInnerObject() {
@@ -367,7 +367,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReturnedObjectInjectedElsewhere() throws Throwable {
         class InnerObject {
             private int mNumMethodInvocations;
@@ -400,7 +400,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testMethodInvokedOnBackgroundThread() throws Throwable {
         injectObjectAndReload(new Object() {
             public void captureThreadId() {
@@ -419,7 +419,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPublicInheritedMethod() throws Throwable {
         class Base {
             public void method(int x) { mTestController.setIntValue(x); }
@@ -433,7 +433,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPrivateInheritedMethod() throws Throwable {
         class Base {
             private void method() {}
@@ -445,7 +445,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testOverriddenMethod() throws Throwable {
         class Base {
             public void method() { mTestController.setStringValue("base"); }
@@ -459,7 +459,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testEnumerateMembers() throws Throwable {
         injectObjectAndReload(new Object() {
             public void method() {}
@@ -476,7 +476,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReflectPublicMethod() throws Throwable {
         injectObjectAndReload(new Object() {
             public String method() { return "foo"; }
@@ -487,7 +487,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReflectPublicField() throws Throwable {
         injectObjectAndReload(new Object() {
             public String field = "foo";
@@ -497,7 +497,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReflectPrivateMethodRaisesException() throws Throwable {
         injectObjectAndReload(new Object() {
             private void method() {};
@@ -510,7 +510,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReflectPrivateFieldRaisesException() throws Throwable {
         injectObjectAndReload(new Object() {
             private int field;
@@ -523,7 +523,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testAllowNonAnnotatedMethods() throws Throwable {
         injectObjectAndReload(new Object() {
             public String allowed() { return "foo"; }
@@ -537,7 +537,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testAllowOnlyAnnotatedMethods() throws Throwable {
         class Test {
             public String allowed() { return "foo"; }
@@ -568,7 +568,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testAnnotationRequirementRetainsPropertyAcrossObjects() throws Throwable {
         class Test {
             @JavascriptInterface
@@ -610,7 +610,7 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testAnnotationDoesNotGetInherited() throws Throwable {
         class Base {
             @JavascriptInterface
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
index 18eb911..599a753 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java
@@ -38,7 +38,7 @@ public class JavaBridgeChildFrameTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testInjectedObjectPresentInChildFrame() throws Throwable {
         // In the case that the test fails (i.e. the child frame doesn't get the injected object,
         // the call to testController.setStringValue in the child frame's onload handler will
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
index 2726cf3..8cdc60a 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
@@ -164,7 +164,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
     // Test passing a JavaScript number in the int32 range to a method of an
     // injected object.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberInt32() throws Throwable {
         executeJavaScript("testObject.setByteValue(42);");
         assertEquals(42, mTestObject.waitForByteValue());
@@ -216,7 +216,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
     // injected object.
     /*
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
       Bug: http://code.google.com/p/chromium/issues/detail?id=145881
     */
     @DisabledTest
@@ -277,7 +277,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
     // Test passing JavaScript NaN to a method of an injected object.
     /*
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
       Bug: http://code.google.com/p/chromium/issues/detail?id=145881
     */
     @DisabledTest
@@ -321,7 +321,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
     // Test passing JavaScript infinity to a method of an injected object.
     /*
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
       Bug: http://code.google.com/p/chromium/issues/detail?id=145881
     */
     @DisabledTest
@@ -366,7 +366,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
 
     // Test passing a JavaScript boolean to a method of an injected object.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassBoolean() throws Throwable {
         executeJavaScript("testObject.setBooleanValue(true);");
         assertTrue(mTestObject.waitForBooleanValue());
@@ -431,7 +431,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
 
     // Test passing a JavaScript string to a method of an injected object.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassString() throws Throwable {
         executeJavaScript("testObject.setStringValue(\"+042.10\");");
         assertEquals("+042.10", mTestObject.waitForStringValue());
@@ -483,7 +483,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
 
     // Test passing a JavaScript object to a method of an injected object.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassJavaScriptObject() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
         executeJavaScript("testObject.setObjectValue({foo: 42});");
@@ -534,7 +534,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
     // this test requires being able to return objects from the methods of
     // injected objects. This is tested elsewhere.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassJavaObject() throws Throwable {
         executeJavaScript("testObject.setObjectValue(testObject.getObjectInstance());");
         assertTrue(mTestObject.getObjectInstance() == mTestObject.waitForObjectValue());
@@ -589,7 +589,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
 
     // Test passing JavaScript null to a method of an injected object.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNull() throws Throwable {
         executeJavaScript("testObject.setObjectValue(null);");
         assertNull(mTestObject.waitForObjectValue());
@@ -627,7 +627,7 @@ public class JavaBridgeCoercionTest extends JavaBridgeTestBase {
 
     // Test passing JavaScript undefined to a method of an injected object.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUndefined() throws Throwable {
         executeJavaScript("testObject.setObjectValue(undefined);");
         assertNull(mTestObject.waitForObjectValue());
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
index cc5888b..9b89984 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
@@ -61,7 +61,7 @@ public class JavaBridgeFieldsTest extends JavaBridgeTestBase {
     // The Java bridge does not provide access to fields.
     // FIXME: Consider providing support for this. See See b/4408210.
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testFieldTypes() throws Throwable {
         assertEquals("undefined",
                 executeJavaScriptAndGetStringResult("typeof testObject.booleanField"));
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
index b6008f9..29fb7df 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
@@ -122,7 +122,7 @@ public class JavaBridgeReturnValuesTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testMethodReturnTypes() throws Throwable {
         assertEquals("boolean",
                 executeJavaScriptAndGetStringResult("typeof testObject.getBooleanValue()"));
@@ -163,7 +163,7 @@ public class JavaBridgeReturnValuesTest extends JavaBridgeTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Android-JavaBridge"})
+    @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testMethodReturnValues() throws Throwable {
         // We do the string comparison in JavaScript, to avoid relying on the
         // coercion algorithm from JavaScript to Java.
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
index 06ddae3..4994ac4 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
@@ -40,7 +40,7 @@ public class LongPressDetectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGestureSimpleLongPress() throws Exception {
         final long downTime = SystemClock.uptimeMillis();
         final long eventTime = SystemClock.uptimeMillis();
@@ -57,7 +57,7 @@ public class LongPressDetectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGestureNoLongPress() throws Exception {
         final long downTime = SystemClock.uptimeMillis();
         final long eventTime = SystemClock.uptimeMillis();
@@ -80,7 +80,7 @@ public class LongPressDetectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGestureLongWithDelayedUp() throws Exception {
         final long downTime = SystemClock.uptimeMillis();
         final long eventTime = SystemClock.uptimeMillis();
@@ -100,7 +100,7 @@ public class LongPressDetectorTest extends InstrumentationTestCase {
      * Verify that the touch move threshold (slop) is working for events offered to native.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testConfirmOfferMoveEventToNative() {
         final int slop = ViewConfiguration.get(getInstrumentation().getTargetContext())
                 .getScaledTouchSlop();
@@ -135,7 +135,7 @@ public class LongPressDetectorTest extends InstrumentationTestCase {
      * @throws Exception
      */
     @LargeTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGestureLongPressDetected() throws Exception {
         final CountDownLatch longPressCalled = new CountDownLatch(1);
         getInstrumentation().runOnMainSync(new Runnable() {