Remove unnecessary stuff from SafeBrowsingTest

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.support.test.filters.SmallTest;
 
 import org.chromium.android_webview.AwBrowserContext;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSwitches;
 import org.chromium.android_webview.AwWebContentsObserver;
 import org.chromium.android_webview.ErrorCodeConversionHelper;
 import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedError2Helper;
 import org.chromium.android_webview.test.util.GraphicsTestUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.InMemorySharedPreferences;
 import org.chromium.components.safe_browsing.SafeBrowsingApiBridge;
 import org.chromium.components.safe_browsing.SafeBrowsingApiHandler;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.test.EmbeddedTestServer;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * Test suite for SafeBrowsing.
  *
  * Ensures that interstitials can be successfully created for malicous pages.
  */
 public class SafeBrowsingTest extends AwTestBase {
     private TestAwContentsClient mContentsClient;
     private AwTestContainerView mContainerView;
     private AwContents mAwContents;
     private TestAwWebContentsObserver mWebContentsObserver;
@@ skipping 221 matching lines @@
     @CommandLineFlags.Add(AwSwitches.WEBVIEW_ENABLE_SAFEBROWSING_SUPPORT)
     public void testSafeBrowsingBackToSafetyShowsNetworkError() throws Throwable {
         int interstitialCount =
                 mWebContentsObserver.getAttachedInterstitialPageHelper().getCallCount();
         final String responseUrl = mTestServer.getURL(MALWARE_HTML_PATH);
         loadUrlAsync(mAwContents, responseUrl);
         mWebContentsObserver.getAttachedInterstitialPageHelper().waitForCallback(interstitialCount);
         OnReceivedError2Helper errorHelper = mContentsClient.getOnReceivedError2Helper();
         int errorCount = errorHelper.getCallCount();
         dontProceedThroughInterstitial();
-        errorHelper.waitForCallback(errorCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        errorHelper.waitForCallback(errorCount);
         assertEquals(ErrorCodeConversionHelper.ERROR_UNKNOWN, errorHelper.getError().errorCode);
         assertEquals(responseUrl, errorHelper.getRequest().url);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     @CommandLineFlags.Add(AwSwitches.WEBVIEW_ENABLE_SAFEBROWSING_SUPPORT)
     public void testSafeBrowsingBackToSafetyShowsNetworkErrorForMaliciousSubresource()
             throws Throwable {
         int interstitialCount =
                 mWebContentsObserver.getAttachedInterstitialPageHelper().getCallCount();
         final String responseUrl = mTestServer.getURL(IFRAME_HTML_PATH);
         loadUrlAsync(mAwContents, responseUrl);
         mWebContentsObserver.getAttachedInterstitialPageHelper().waitForCallback(interstitialCount);
         OnReceivedError2Helper errorHelper = mContentsClient.getOnReceivedError2Helper();
         int errorCount = errorHelper.getCallCount();
         dontProceedThroughInterstitial();
-        errorHelper.waitForCallback(errorCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        errorHelper.waitForCallback(errorCount);
         assertEquals(ErrorCodeConversionHelper.ERROR_UNKNOWN, errorHelper.getError().errorCode);
         final String subresourceUrl = mTestServer.getURL(MALWARE_HTML_PATH);
         assertEquals(subresourceUrl, errorHelper.getRequest().url);
         assertFalse(errorHelper.getRequest().isMainFrame);
     }
 }