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 76 matching lines @@
         if (needsAwBrowserContextCreated()) {
             createAwBrowserContext();
         }
 
         super.setUp();
         if (needsBrowserProcessStarted()) {
             startBrowserProcess();
         }
     }
 
     protected void createAwBrowserContext() {

[boliu, 2017/02/14 18:31:40]

ideally this would be made private as well, are there tests that legitimately
can't be moved to createAwBrowserContextHelper?

[Nate Fischer, 2017/02/14 19:42:55]

No other test overrides this function, but AwStrictModeTest.java invokes this
function. I can't think of a way to make this private without adding obscurity.
If you have a suggestion in mind, please let me know.

[boliu, 2017/02/14 22:26:57]

Ok. This is fine then.

         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);
+                createAwBrowserContextHelper(prefs, appContext);
             }
         });
     }
 
+    protected void createAwBrowserContextHelper(

[boliu, 2017/02/14 18:31:40]

s/Helper/onUiThread/

[Nate Fischer, 2017/02/14 19:42:55]

Done

+            InMemorySharedPreferences prefs, Context appContext) {
+        setBrowserContext(new AwBrowserContext(prefs, appContext));
+    }
+
+    protected void setBrowserContext(AwBrowserContext browserContext) {

[boliu, 2017/02/14 18:31:40]

this should be private (or shouldn't exist at all), just have
createAwBrowserContextHelper return the context, and set it in
createAwBrowserContext

[Nate Fischer, 2017/02/14 19:42:55]

Done

+        mBrowserContext = browserContext;
+    }
+
     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 582 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);
     }
 }