Add javatests for the WebView SafeBrowsing feature

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

 // Copyright 2012 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 static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.app.Instrumentation;
 import android.content.Context;
@@ skipping 86 matching lines @@
     protected void createAwBrowserContext() {
         if (mBrowserContext != null) {
             throw new AndroidRuntimeException("There should only be one browser context.");
         }
         getActivity(); // The Activity must be launched in order to load native code
         final InMemorySharedPreferences prefs = new InMemorySharedPreferences();
         final Context appContext = getInstrumentation().getTargetContext().getApplicationContext();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                mBrowserContext = new AwBrowserContext(prefs, appContext);
+                mBrowserContext = createAwBrowserContextOnUiThread(prefs, appContext);
             }
         });
     }
 
+    protected AwBrowserContext createAwBrowserContextOnUiThread(
+            InMemorySharedPreferences prefs, Context appContext) {
+        return new AwBrowserContext(prefs, appContext);
+    }
+
     protected void startBrowserProcess() throws Exception {
         // The Activity must be launched in order for proper webview statics to be setup.
         getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 AwBrowserProcess.start();
             }
         });
     }
@@ skipping 237 matching lines @@
                             public void onComplete(long id) {
                                 assertEquals(requestId, id);
                                 ch.notifyCalled();
                             }
                         });
             }
         });
         ch.waitForCallback(chCount);
     }
 
+    // Gets the pixel color at the center of AwContents.
+    public int getPixelColorAtCenterOfView(

[boliu, 2017/02/21 21:37:47]

I think this can just be static, in which case just put it in GraphicsTestUtils

[Nate Fischer, 2017/02/21 21:56:06]

Done

+            final AwContents awContents, final AwTestContainerView testContainerView) {
+        return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Integer>() {
+            @Override
+            public Integer call() {
+                Bitmap bitmap = GraphicsTestUtils.drawAwContents(awContents, 2, 2,
+                        -(float) testContainerView.getWidth() / 2,
+                        -(float) testContainerView.getHeight() / 2);
+                return bitmap.getPixel(0, 0);
+            }
+        });
+    }
+
     // Waits for the pixel at the center of AwContents to color up into expectedColor.
     // Note that this is a stricter condition that waiting for a visual state callback,
     // as visual state callback only indicates that *something* has appeared in WebView.
     public void waitForPixelColorAtCenterOfView(final AwContents awContents,
             final AwTestContainerView testContainerView, final int expectedColor) throws Exception {
         pollUiThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                Bitmap bitmap = GraphicsTestUtils.drawAwContents(awContents, 2, 2,
-                        -(float) testContainerView.getWidth() / 2,
-                        -(float) testContainerView.getHeight() / 2);
-                return bitmap.getPixel(0, 0) == expectedColor;
+                return getPixelColorAtCenterOfView(awContents, testContainerView) == expectedColor;
             }
         });
     }
 
     /**
      * Checks the current test has |clazz| annotation. Note this swallows NoSuchMethodException
      * and returns false in that case.
      */
     private boolean testMethodHasAnnotation(Class<? extends Annotation> clazz) {
         String testName = getName();
@@ skipping 313 matching lines @@
         int titleCallCount = onReceivedTitleHelper.getCallCount();
 
         onPageFinishedHelper.waitForCallback(finishCallCount, 1, WAIT_TIMEOUT_MS,
                 TimeUnit.MILLISECONDS);
         onReceivedTitleHelper.waitForCallback(titleCallCount, 1, WAIT_TIMEOUT_MS,
                 TimeUnit.MILLISECONDS);
 
         return new PopupInfo(popupContentsClient, popupContainerView, popupContents);
     }
 }