WebView: Refactor PlatformServiceBridge.getInstance

android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java

Index: android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
diff --git a/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java b/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
index 9be1b7715df5ec5c8b5fe712a957efade1803d03..f89b95cd77872338aa073cd92f2046a941999ad9 100644
--- a/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
+++ b/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
@@ -76,7 +76,7 @@ public class AwMinidumpUploaderDelegate implements MinidumpUploaderDelegate {
 
     @Override
     public void prepareToUploadMinidumps(final Runnable startUploads) {
-        createPlatformServiceBridge().queryMetricsSetting(new ValueCallback<Boolean>() {
+        PlatformServiceBridge.getInstance().queryMetricsSetting(new ValueCallback<Boolean>() {

[gsennton, 2017/04/03 09:56:20]

When is the PlatformServiceBridge created in this case? If I'm not completely
mistaken this runs in a separate process which hasn't run any code from
WebViewChromiumFactoryProvider.

[paulmiller, 2017/04/03 23:34:16]

Aye. I thought it would work because the tests passed, but testing in an actual
app shows you're right.

More experimentation shows that calling createInstance() exactly once is
actually kind of tricky. E.g. this doc:

https://developer.android.com/guide/components/activities/activity-lifecycle....

suggests you'll only get an onCreate call in a fresh process, so I figured it
would be safe to call createInstance() in AwMinidumpUploadJobService.onCreate()
or CrashReceiverService.onCreate(). But that didn't work, so I guess Services
are different? The documentation isn't great.

I think the solution is to make createInstance() more singleton-y: it shouldn't
punish you for calling it multiple times, so you can just call it whenever it's
convenient and not have to think so hard about whether it could have already
been created. I'm renaming createInstance() to getOrCreateInstance() to reflect
that.

             public void onReceiveValue(Boolean enabled) {
                 ThreadUtils.assertOnUiThread();
                 mPermittedByUser = enabled;
@@ -90,13 +90,4 @@ public class AwMinidumpUploaderDelegate implements MinidumpUploaderDelegate {
 
     @Override
     public void recordUploadFailure(File minidump) {}
-
-    /**
-     * Utility method to allow us to test the logic of this class by injecting
-     * a test-specific PlatformServiceBridge.
-     */
-    @VisibleForTesting
-    public PlatformServiceBridge createPlatformServiceBridge() {
-        return PlatformServiceBridge.getInstance(mContext);
-    }
 }