| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
|
| 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 a9f4cdded7f64eabd4af423ad40355e69c72991a..07a0e4f99d8156f9a42308826902a84f295b43bb 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
|
| @@ -2435,12 +2435,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
| views.getContents1(), views.getClient1(), true));
|
| }
|
|
|
| - /*
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Preferences"})
|
| - Crashing in DCHECK after webkit roll. See crbug.com/222069.
|
| - */
|
| - @DisabledTest
|
| // Verify that LoadViewOverviewMode doesn't affect pages with initial scale
|
| // set in the viewport tag.
|
| public void testLoadWithOverviewModeViewportScale() throws Throwable {
|
| @@ -2472,12 +2468,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
| assertEquals((float)pageScale, getScaleOnUiThread(awContents));
|
| }
|
|
|
| - /*
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Preferences"})
|
| - Crashing in DCHECK after webkit roll. See crbug.com/222069.
|
| - */
|
| - @DisabledTest
|
| public void testSetInitialScale() throws Throwable {
|
| final TestAwContentsClient contentClient = new TestAwContentsClient();
|
| final AwTestContainerView testContainerView =
|
|
|