Add javatests for the WebView SafeBrowsing feature

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
index dd079f1baaf1f5969852bd23d70cc5c821062187..f2267e288d98fa9a2177abc917b19e989eb354cd 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
@@ -8,7 +8,6 @@ import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.util.AndroidRuntimeException;
 import android.util.Log;
@@ -104,11 +103,16 @@ public class AwTestBase
         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();
@@ -374,10 +378,8 @@ public class AwTestBase
         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 GraphicsTestUtils.getPixelColorAtCenterOfView(awContents, testContainerView)
+                        == expectedColor;
             }
         });
     }