diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 12:32:18 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 12:32:18 +0000 |
| commit | a2c16267dd49b70a70582e68cb7209e0587c8f39 (patch) | |
| tree | 22ff120b60d8204dc71a55bbbdd2ab1f359b9c41 /android_webview | |
| parent | 7da6cdfe11b5f49a5114b33e75855aa95b39a89b (diff) | |
| download | chromium_src-a2c16267dd49b70a70582e68cb7209e0587c8f39.zip chromium_src-a2c16267dd49b70a70582e68cb7209e0587c8f39.tar.gz chromium_src-a2c16267dd49b70a70582e68cb7209e0587c8f39.tar.bz2 | |
[Android] Fix AwSettingsTest.testUserAgent... tests.
Upstream missing code.
This fixes the following tests:
AwSettingsTest.testUserAgentStringOverrideForHistory
AwSettingsTest.testUserAgentStringNormal
AwSettingsTest.testUserAgentStringIncognito
AwSettingsTest.testUserAgentStringBoth
R=mkosiba@chromium.org,bulach@chromium.org
BUG=153516
Review URL: https://codereview.chromium.org/11013022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java | 32 |
1 files changed, 8 insertions, 24 deletions
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 4f5fb21..30d53a0 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 @@ -1149,12 +1149,8 @@ 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"}) - * BUG=153516 - */ - @FlakyTest + @SmallTest + @Feature({"Android-WebView", "Preferences"}) public void testUserAgentStringOverrideForHistory() throws Throwable { final TestAwContentsClient contentClient = new TestAwContentsClient(); final ContentViewCore contentView = @@ -1191,12 +1187,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase { assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(contentView)); } - /** - * @SmallTest - * @Feature({"Android-WebView", "Preferences"}) - * BUG=153516 - */ - @FlakyTest + @SmallTest + @Feature({"Android-WebView", "Preferences"}) public void testUserAgentStringNormal() throws Throwable { ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW); runPerViewSettingsTest( @@ -1204,12 +1196,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase { new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1())); } - /** - * @SmallTest - * @Feature({"Android-WebView", "Preferences"}) - * BUG=153516 - */ - @FlakyTest + @SmallTest + @Feature({"Android-WebView", "Preferences"}) public void testUserAgentStringIncognito() throws Throwable { ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW); runPerViewSettingsTest( @@ -1217,12 +1205,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase { new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1())); } - /** - * @SmallTest - * @Feature({"Android-WebView", "Preferences"}) - * BUG=153516 - */ - @FlakyTest + @SmallTest + @Feature({"Android-WebView", "Preferences"}) public void testUserAgentStringBoth() throws Throwable { ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW); runPerViewSettingsTest( |