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

21 files changed, 186 insertions, 186 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
index 466d714..9dbdf7b 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
  */
 public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDataUrl() throws Throwable {
         final String expectedTitle = "dataUrlTest";
         final String data =
@@ -40,7 +40,7 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDataUrlBase64() throws Throwable {
         final String expectedTitle = "dataUrlTestBase64";
         final String data = "PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC90aXRsZT48" +
@@ -77,7 +77,7 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testLoadUrlWithExtraHeaders() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
index 14b4a55..9967345 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
@@ -73,7 +73,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testExplicitGoodPath() throws Throwable {
         final String path = new File(getActivity().getFilesDir(), "test.mht").getAbsolutePath();
         File file = new File(path);
@@ -87,7 +87,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testAutoGoodPath() throws Throwable {
         final String path = getActivity().getFilesDir().getAbsolutePath() + "/";
 
@@ -108,7 +108,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testExplicitBadPath() throws Throwable {
         final String path = new File("/foo/bar/baz.mht").getAbsolutePath();
         File file = new File(path);
@@ -122,7 +122,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testAutoBadPath() throws Throwable {
         final String path = new File("/foo/bar/").getAbsolutePath();
         File file = new File(path);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
index 1b4b640..3876739 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
@@ -81,7 +81,7 @@ public class AwContentsClientOnFormResubmissionTest extends AndroidWebViewTestBa
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testResend() throws Throwable {
         mContentsClient.setResubmit(true);
         doReload();
@@ -90,7 +90,7 @@ public class AwContentsClientOnFormResubmissionTest extends AndroidWebViewTestBa
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testDontResend() throws Throwable {
         mContentsClient.setResubmit(false);
         doReload();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
index e6bc413..8c457a9 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
@@ -189,7 +189,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationNotCalledOnLoadUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -205,7 +205,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCantBlockLoads() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -224,7 +224,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView", "Navigation"})
+     * @Feature({"AndroidWebView", "Navigation"})
      * BUG=154292
      */
     @DisabledTest
@@ -252,7 +252,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView", "Navigation"})
+     * @Feature({"AndroidWebView", "Navigation"})
      * BUG=154292
      */
     @DisabledTest
@@ -287,7 +287,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationNotCalledForAnchorNavigations() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -317,7 +317,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenLinkClicked() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -339,7 +339,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
 
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenSelfLinkClicked() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -366,7 +366,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenNavigatingFromJavaScriptUsingAssign()
             throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
@@ -389,7 +389,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenNavigatingFromJavaScriptUsingReplace()
             throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
@@ -410,7 +410,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationPassesCorrectUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -431,7 +431,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCanIgnoreLoading() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -475,7 +475,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledForDataUrl() throws Throwable {
         final String dataUrl =
                 "data:text/html;base64," +
@@ -501,7 +501,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledForUnsupportedSchemes() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -522,7 +522,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationNotCalledForPostNavigations() throws Throwable {
         // The reason POST requests are excluded is BUG 155250.
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
@@ -559,7 +559,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationNotCalledForIframeNavigations() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -640,7 +640,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledOn302Redirect() throws Throwable {
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
         final String redirectUrl = mWebServer.setRedirect("/302.html", redirectTargetUrl);
@@ -650,7 +650,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledOnMetaRefreshRedirect() throws Throwable {
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
         final String redirectUrl = addPageToTestServer(mWebServer, "/meta_refresh.html",
@@ -661,7 +661,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
 
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledOnJavaScriptLocationImmediateAssignRedirect()
             throws Throwable {
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
@@ -672,7 +672,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledOnJavaScriptLocationImmediateReplaceRedirect()
             throws Throwable {
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
@@ -683,7 +683,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledOnJavaScriptLocationDelayedAssignRedirect()
             throws Throwable {
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
@@ -694,7 +694,7 @@ public class AwContentsClientShouldIgnoreNavigationTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledOnJavaScriptLocationDelayedReplaceRedirect()
             throws Throwable {
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
index 0dbdc8b..1334eae 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
@@ -132,7 +132,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testCalledWithCorrectUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -158,7 +158,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOnLoadResourceCalledWithCorrectUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -178,7 +178,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDoesNotCrashOnInvalidData() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -238,7 +238,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDoesNotCrashOnEmptyStream() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -267,7 +267,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testCanInterceptMainFrame() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -291,7 +291,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDoesNotChangeReportedUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -313,7 +313,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
 
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testCalledForImage() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -339,7 +339,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testCalledForIframe() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -361,7 +361,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testCalledForUnsupportedSchemes() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 17065cf1..2bce18a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -38,7 +38,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     private TestAwContentsClient mContentsClient = new TestAwContentsClient();
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     @UiThreadTest
     public void testCreateDestroy() throws Throwable {
         // NOTE this test runs on UI thread, so we cannot call any async methods.
@@ -70,7 +70,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testDocumentHasImages() throws Throwable {
         AwTestContainerView testView = createAwTestContainerViewOnMainSync(mContentsClient);
         AwContents awContents = testView.getAwContents();
@@ -103,7 +103,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testClearCacheMemoryAndDisk() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
@@ -157,7 +157,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testClearCacheInQuickSuccession() throws Throwable {
         final AwTestContainerView testContainer =
                 createAwTestContainerViewOnMainSync(false, new TestAwContentsClient());
@@ -178,7 +178,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * BUG 6094807
      */
     @DisabledTest
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index c7d9e6f..0bd7c6f5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -948,7 +948,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     // enabled by default in Chrome, but must be disabled by default
     // in WebView.
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptDisabledByDefault() throws Throwable {
         final String JS_ENABLED_STRING = "JS has run";
         final String JS_DISABLED_STRING = "JS has not run";
@@ -970,7 +970,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptEnabledNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -979,7 +979,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptEnabledIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -988,7 +988,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptEnabledBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -997,7 +997,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptEnabledDynamicNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1006,7 +1006,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1015,7 +1015,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testJavaScriptEnabledDynamicBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1024,7 +1024,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testPluginsEnabledNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1033,7 +1033,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testPluginsEnabledIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1042,7 +1042,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testPluginsEnabledBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1051,7 +1051,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testStandardFontFamilyNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1060,7 +1060,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testStandardFontFamilyIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1069,7 +1069,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testStandardFontFamilyBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1078,7 +1078,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDefaultFontSizeNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1087,7 +1087,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDefaultFontSizeIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1096,7 +1096,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDefaultFontSizeBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1108,7 +1108,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     // setLoadsImagesAutomatically to false doesn't prevent images already
     // contained in the memory cache to be displayed.  The cache is shared among
     // all views, so the image can be put there by another view.
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     @SmallTest
     public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
@@ -1179,7 +1179,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     // setting value from false to true previously skipped images are
     // automatically loaded.
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1214,7 +1214,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1225,7 +1225,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1236,7 +1236,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1247,7 +1247,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDefaultTextEncodingNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1256,7 +1256,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDefaultTextEncodingIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1265,7 +1265,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDefaultTextEncodingBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1280,7 +1280,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     // [<devicemodel>;] Build/<buildID>) AppleWebKit/<major>.<minor> (KHTML, like Gecko)
     // Version/<major>.<minor>[ Mobile] Safari/<major>.<minor>
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentStringDefault() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1309,7 +1309,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentStringOverride() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1339,7 +1339,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     // Verify that the current UA override setting has a priority over UA
     // overrides in navigation history entries.
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentStringOverrideForHistory() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1379,7 +1379,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentStringNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1388,7 +1388,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentStringIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1397,7 +1397,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentStringBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1406,7 +1406,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUserAgentWithTestServer() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1441,7 +1441,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDomStorageEnabledNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1450,7 +1450,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDomStorageEnabledIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1459,7 +1459,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testDomStorageEnabledBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1468,7 +1468,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUniversalAccessFromFilesNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1479,7 +1479,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUniversalAccessFromFilesIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1490,7 +1490,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testUniversalAccessFromFilesBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1503,7 +1503,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     // This test verifies that local image resources can be loaded from file:
     // URLs regardless of file access state.
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesImage() throws Throwable {
         final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
         final String imageHeight = "16";
@@ -1520,7 +1520,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesIframeNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1531,7 +1531,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesIframeIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1542,7 +1542,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesIframeBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1553,7 +1553,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesXhrNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1564,7 +1564,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesXhrIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1575,7 +1575,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileAccessFromFilesXhrBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1586,7 +1586,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileUrlAccessNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1595,7 +1595,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileUrlAccessIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1604,7 +1604,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testFileUrlAccessBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1613,7 +1613,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testContentUrlAccessNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1622,7 +1622,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testContentUrlAccessIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1631,7 +1631,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testContentUrlAccessBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1640,7 +1640,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences", "Navigation"})
+    @Feature({"AndroidWebView", "Preferences", "Navigation"})
     public void testBlockingContentUrlsFromDataUrls() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1662,7 +1662,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences", "Navigation"})
+    @Feature({"AndroidWebView", "Preferences", "Navigation"})
     public void testContentUrlFromFileNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
@@ -1673,7 +1673,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences", "Navigation"})
+    @Feature({"AndroidWebView", "Preferences", "Navigation"})
     public void testContentUrlFromFileIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1684,7 +1684,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences", "Navigation"})
+    @Feature({"AndroidWebView", "Preferences", "Navigation"})
     public void testContentUrlFromFileBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
@@ -1695,7 +1695,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1715,7 +1715,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
@@ -1762,7 +1762,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     // Test an assert URL (file:///android_asset/)
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testAssetUrl() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
@@ -1784,7 +1784,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     // Test a resource URL (file:///android_res/).
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testResourceUrl() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
@@ -1806,7 +1806,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     // Test that the file URL access toggle does not affect asset URLs.
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testFileUrlAccessToggleDoesNotBlockAssetUrls() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
@@ -1830,7 +1830,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     // Test that the file URL access toggle does not affect resource URLs.
     @SmallTest
-    @Feature({"Android-WebView", "Navigation"})
+    @Feature({"AndroidWebView", "Navigation"})
     public void testFileUrlAccessToggleDoesNotBlockResourceUrls() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
@@ -1854,7 +1854,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "Preferences"})
+     * @Feature({"AndroidWebView", "Preferences"})
      * Blocked on crbug/157563
      */
     @DisabledTest
@@ -1867,7 +1867,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "Preferences"})
+     * @Feature({"AndroidWebView", "Preferences"})
      * Blocked on crbug/157563
      */
     @DisabledTest
@@ -1880,7 +1880,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "Preferences"})
+     * @Feature({"AndroidWebView", "Preferences"})
      * Blocked on crbug/157563
      */
     @DisabledTest
@@ -2042,7 +2042,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Preferences"})
+    @Feature({"AndroidWebView", "Preferences"})
     public void testBlockNetworkLoadsWithHttpResources() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
index 4c61559..6f8b5c8 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
@@ -58,7 +58,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testAddMessageToConsoleCalledWithCorrectLevel() throws Throwable {
         TestAwContentsClient.AddMessageToConsoleHelper addMessageToConsoleHelper =
                 mContentsClient.getAddMessageToConsoleHelper();
@@ -92,7 +92,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testAddMessageToConsoleCalledWithCorrectMessage() throws Throwable {
         TestAwContentsClient.AddMessageToConsoleHelper addMessageToConsoleHelper =
                 mContentsClient.getAddMessageToConsoleHelper();
@@ -114,7 +114,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testAddMessageToConsoleCalledWithCorrectLineAndSource() throws Throwable {
         TestAwContentsClient.AddMessageToConsoleHelper addMessageToConsoleHelper =
                 mContentsClient.getAddMessageToConsoleHelper();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
index ff9e660..61b4961 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
@@ -30,7 +30,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOnPageFinishedPassesCorrectUrl() throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mContentsClient.getOnPageFinishedHelper();
@@ -44,7 +44,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
     }
 
     //@MediumTest
-    //@Feature({"Android-WebView"})
+    //@Feature({"AndroidWebView"})
     // See crbug.com/148917
     @FlakyTest
     public void testOnPageFinishedCalledAfterError() throws Throwable {
@@ -66,7 +66,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOnPageFinishedNotCalledForValidSubresources() throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mContentsClient.getOnPageFinishedHelper();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
index 72c696f..8f25029 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
@@ -31,7 +31,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOnReceivedErrorOnInvalidUrl() throws Throwable {
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
@@ -48,7 +48,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOnReceivedErrorOnInvalidScheme() throws Throwable {
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
@@ -65,7 +65,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testNoErrorOnFailedSubresourceLoad() throws Throwable {
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
@@ -83,7 +83,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testNonExistentAssetUrl() throws Throwable {
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
@@ -104,7 +104,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testNonExistentResourceUrl() throws Throwable {
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
index 0fc0282..d4f66aa 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
@@ -47,7 +47,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * crbug.com/147721
      */
     @DisabledTest
@@ -82,7 +82,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testFindAddress() {
         assertNull(ContentViewStatics.findAddress("This is some random text"));
 
@@ -91,7 +91,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testEnableDisablePlatformNotifications() {
 
         // Set up mock contexts to use with the listener
@@ -150,7 +150,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * Bug 6931901
      */
     @DisabledTest
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
index 9409ff7..b9bfd5b 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
@@ -214,7 +214,7 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * BUG 153522
      */
     @FlakyTest
@@ -226,7 +226,7 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
     // even if supportZoom is turned off.
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * BUG 153522
      */
     @FlakyTest
@@ -235,7 +235,7 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testZoomUsingMultiTouch() throws Throwable {
         ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
@@ -254,7 +254,7 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * BUG 153522
      */
     @FlakyTest
@@ -281,7 +281,7 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testZoomControlsOnNonZoomableContent() throws Throwable {
         ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
@@ -301,7 +301,7 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * BUG 153523
      */
     @DisabledTest
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
index 24f8ded..7b7c8bb 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
@@ -48,7 +48,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "Privacy"})
+    @Feature({"AndroidWebView", "Privacy"})
     public void testAllowFileSchemeCookies() throws Throwable {
         assertFalse(CookieManager.allowFileSchemeCookies());
         CookieManager.setAcceptFileSchemeCookies(true);
@@ -58,7 +58,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView", "Privacy"})
+    @Feature({"AndroidWebView", "Privacy"})
     public void testAcceptCookie() throws Throwable {
         TestWebServer webServer = null;
         try {
@@ -153,7 +153,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView", "Privacy"})
+    @Feature({"AndroidWebView", "Privacy"})
     public void testRemoveAllCookie() throws InterruptedException {
         // enable cookie
         mCookieManager.setAcceptCookie(true);
@@ -186,7 +186,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
     }
 
     @MediumTest
-    @Feature({"Android-WebView", "Privacy"})
+    @Feature({"AndroidWebView", "Privacy"})
     @SuppressWarnings("deprecation")
     public void testCookieExpiration() throws InterruptedException {
         // enable cookie
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
index 366cfcc..9b82a77 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
@@ -81,7 +81,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      */
     @Smoke
     @SmallTest
-    @Feature({"Android-WebView", "Main"})
+    @Feature({"AndroidWebView", "Main"})
     public void testLoadDataGetTitle() throws Throwable {
         final String title = loadFromDataAndGetTitle(getHtml(TITLE));
         assertEquals("Title should be " + TITLE, TITLE, title);
@@ -92,7 +92,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      * @throws Throwable
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGetTitleOnDataContainingEmptyTitle() throws Throwable {
         final String content = getHtml("");
         final String expectedTitle = "data:text/html," + content;
@@ -106,7 +106,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      * @throws Throwable
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGetTitleOnDataContainingNoTitle() throws Throwable {
         final String content = getHtml(null);
         final String expectedTitle = "data:text/html," + content;
@@ -120,7 +120,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      */
     /**
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      * BUG 7228619
      */
     @DisabledTest
@@ -135,7 +135,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      * @throws Throwable
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGetTitleOnLoadUrlFileContainingEmptyTitle() throws Throwable {
         final PageInfo info = loadFromUrlAndGetTitle(getHtml(""), GET_TITLE_TEST_EMPTY_PATH);
         assertEquals("Incorrect title :: " , info.mUrl, info.mTitle);
@@ -147,7 +147,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      * @throws Throwable
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testGetTitleOnLoadUrlFileContainingNoTitle() throws Throwable {
         final PageInfo info = loadFromUrlAndGetTitle(getHtml(null), GET_TITLE_TEST_NO_TITLE_PATH);
         assertEquals("Incorrect title :: " , info.mUrl, info.mTitle);
@@ -158,7 +158,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
      * used in the page's script then the page's title is reported incorrectly.
      * Bug: crbug.com/151012
      * @SmallTest
-     * @Feature({"Android-WebView"})
+     * @Feature({"AndroidWebView"})
      */
     @DisabledTest
     public void testGetTitleWithWriteln() throws Throwable {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
index 30b5da1..f337e2d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
@@ -28,7 +28,7 @@ public class HttpAuthDatabaseTest extends AndroidTestCase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testAccessHttpAuthUsernamePassword() throws Exception {
         HttpAuthDatabase instance = new HttpAuthDatabase(getContext(), TEST_DATABASE);
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
index b6e0f55..5e60f96 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
@@ -94,7 +94,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
 
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testImageLoad() throws Throwable {
         TestWebServer webServer = null;
         try {
@@ -117,7 +117,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testScriptLoad() throws Throwable {
         TestWebServer webServer = null;
         try {
@@ -137,7 +137,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testSameOrigin() throws Throwable {
         TestWebServer webServer = null;
         try {
@@ -156,7 +156,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testCrossOrigin() throws Throwable {
         TestWebServer webServer = null;
         try {
@@ -179,7 +179,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testNullBaseUrl() throws Throwable {
         getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
         final String pageHtml = "<html><body onload='document.title=document.location.href'>" +
@@ -189,7 +189,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHistoryUrl() throws Throwable {
 
         final String pageHtml = "<html><body>Hello, world!</body></html>";
@@ -207,7 +207,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHistoryUrlIgnoredWithDataSchemeBaseUrl() throws Throwable {
         final String pageHtml = "<html><body>bar</body></html>";
         final String historyUrl = "http://history.com/";
@@ -217,7 +217,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testHistoryUrlNavigation() throws Throwable {
         TestWebServer webServer = null;
         try {
@@ -281,7 +281,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testLoadDataWithBaseUrlAccessingFile() throws Throwable {
         // Create a temporary file on the filesystem we can try to read.
         File cacheDir = getActivity().getCacheDir();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
index 786b9ed..46349e0 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
@@ -29,7 +29,7 @@ public class UserAgentTest extends AndroidWebViewTestBase {
      * two spaces before the Android build name.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testNoExtraSpaceBeforeBuildName() throws Throwable {
         getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
         loadDataSync(
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
index c595b97..6058b37 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
@@ -16,7 +16,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -26,7 +26,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -37,7 +37,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -48,26 +48,26 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "FindInPage"})
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllDoesNotFind() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread("foo"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "FindInPage"})
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllEmptyPage() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread("foo"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "FindInPage"})
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllEmptyString() throws Throwable {
         assertEquals(0, findAllAsyncOnUiThread(""));
     }
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -82,7 +82,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -97,7 +97,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -115,7 +115,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -131,7 +131,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -142,7 +142,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -155,7 +155,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -167,7 +167,7 @@ public class WebViewAsynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
index 4584c2a..0f03bf5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
@@ -18,7 +18,7 @@ public class WebViewMixedFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -35,7 +35,7 @@ public class WebViewMixedFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
index e679214..9e670d2 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
@@ -33,7 +33,7 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
      * Verify that when the AwContentsClient calls handleJsAlert.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOverrideAlertHandling() throws Throwable {
         final String ALERT_TEXT = "Hello World!";
 
@@ -62,7 +62,7 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
      * Verify that when the AwContentsClient calls handleJsPrompt.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOverridePromptHandling() throws Throwable {
         final String PROMPT_TEXT = "How do you like your eggs in the morning?";
         final String PROMPT_DEFAULT = "Scrambled";
@@ -96,7 +96,7 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
      * Verify that when the AwContentsClient calls handleJsConfirm and the client confirms.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOverrideConfirmHandlingConfirmed() throws Throwable {
         final String CONFIRM_TEXT = "Would you like a cookie?";
 
@@ -126,7 +126,7 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
      * Verify that when the AwContentsClient calls handleJsConfirm and the client cancels.
      */
     @SmallTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOverrideConfirmHandlingCancelled() throws Throwable {
         final String CONFIRM_TEXT = "Would you like a cookie?";
 
@@ -156,7 +156,7 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
      * Verify that when the AwContentsClient calls handleJsBeforeUnload
      */
     @MediumTest
-    @Feature({"Android-WebView"})
+    @Feature({"AndroidWebView"})
     public void testOverrideBeforeUnloadHandling() throws Throwable {
         final CallbackHelper jsBeforeUnloadHelper = new CallbackHelper();
         TestAwContentsClient client = new TestAwContentsClient() {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
index 2c5d558..597f1b0 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
@@ -17,7 +17,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -27,7 +27,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -38,7 +38,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -49,26 +49,26 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "FindInPage"})
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllDoesNotFind() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread("foo"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "FindInPage"})
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllEmptyPage() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread("foo"));
     }
 
     @SmallTest
-    @Feature({"Android-WebView", "FindInPage"})
+    @Feature({"AndroidWebView", "FindInPage"})
     public void testFindAllEmptyString() throws Throwable {
         assertEquals(0, findAllSyncOnUiThread(""));
     }
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -83,7 +83,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * http://crbug.com/154809
      */
     @FlakyTest
@@ -98,7 +98,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -116,7 +116,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /**
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * http://crbug.com/154760
      */
     @FlakyTest
@@ -132,7 +132,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -143,7 +143,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -156,7 +156,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest
@@ -168,7 +168,7 @@ public class WebViewSynchronousFindApisTest extends WebViewFindApisTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"Android-WebView", "FindInPage"})
+     * @Feature({"AndroidWebView", "FindInPage"})
      * BUG=158284
      */
     @DisabledTest