Enable testUseWideViewportLayoutWidth{NoQuirks}

Run testUseWideViewportLayoutWidthNoQuirks() on N 600 times and
on O 100 times, then run both tests for another 500 times, didn't see
any failure, enable to see how will the flakiness dashboard say.

Bug: 797009
Change-Id: If970a068fe6bccc5a9b1d7960fa69ff678260112
Reviewed-on: https://chromium-review.googlesource.com/1014475Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551385}

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

@@ -2632,28 +2632,23 @@ public class AwSettingsTest {
                 viewportTagSpecifiedWidth, mActivityTestRule.getTitleOnUiThread(awContents));
     }
 
-    // WebView layout width tests are flaky: http://crbug.com/746264
     @Test
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    @DisabledTest(message = "crbug.com/746264")
     public void testUseWideViewportLayoutWidth() throws Throwable {
         TestAwContentsClient contentClient = new TestAwContentsClient();
         AwTestContainerView testContainerView =
-                mActivityTestRule.createAwTestContainerViewOnMainSync(contentClient);
+                mActivityTestRule.createAwTestContainerViewOnMainSync(contentClient, true);
         useWideViewportLayoutWidthTest(testContainerView, contentClient.getOnPageFinishedHelper());
     }
 
-    // WebView layout width tests are flaky: http://crbug.com/746264
-    @RetryOnFailure
     @Test
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    @DisabledTest(message = "crbug.com/746264")
     public void testUseWideViewportLayoutWidthNoQuirks() throws Throwable {
         TestAwContentsClient contentClient = new TestAwContentsClient();
         AwTestContainerView testContainerView =
-                mActivityTestRule.createAwTestContainerViewOnMainSync(contentClient, false);
+                mActivityTestRule.createAwTestContainerViewOnMainSync(contentClient);
         useWideViewportLayoutWidthTest(testContainerView, contentClient.getOnPageFinishedHelper());
     }