WebView: Refactor PlatformServiceBridge.getInstance

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

 // Copyright 2014 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 com.android.webview.chromium;
 
 import android.Manifest;
 import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
@@ skipping 384 matching lines @@
 
         try {
             LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitialized();
         } catch (ProcessInitException e) {
             throw new RuntimeException("Error initializing WebView library", e);
         }
 
         PathService.override(PathService.DIR_MODULE, "/system/lib/");
         PathService.override(DIR_RESOURCE_PAKS_ANDROID, "/system/framework/webview/paks");
 
+        final Context context = ContextUtils.getApplicationContext();
+        // Future calls to PlatformServiceBridge.getInstance() rely on it having been created here.
+        PlatformServiceBridge.getOrCreateInstance(context);
+
         // Make sure that ResourceProvider is initialized before starting the browser process.
         final PackageInfo webViewPackageInfo = WebViewFactory.getLoadedPackageInfo();
         final String webViewPackageName = webViewPackageInfo.packageName;
-        final Context context = ContextUtils.getApplicationContext();
         setUpResources(webViewPackageInfo, context);
         initPlatSupportLibrary();
         doNetworkInitializations(context);
         final boolean isExternalService = true;
         AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, isExternalService);
         AwBrowserProcess.start();
 
         final boolean enableMinidumpUploadingForTesting = CommandLine.getInstance().hasSwitch(
                 CommandLineUtil.CRASH_UPLOADS_ENABLED_FOR_TESTING_SWITCH);
         if (enableMinidumpUploadingForTesting) {
             AwBrowserProcess.handleMinidumps(webViewPackageName, true /* enabled */);
         }
 
-        // Actions conditioned on whether the Android Checkbox is toggled on
-        PlatformServiceBridge.getInstance(context)
-                .queryMetricsSetting(new ValueCallback<Boolean>() {
-                    public void onReceiveValue(Boolean enabled) {
-                        ThreadUtils.assertOnUiThread();
-                        AwMetricsServiceClient.setConsentSetting(context, enabled);
+        // Future calls to PlatformServiceBridge.getInstance() rely on it having been created here.

[gsennton, 2017/04/05 15:21:13]

This comment doesn't fit here anymore?

[paulmiller, 2017/04/05 17:02:39]

Done.

+        PlatformServiceBridge.getInstance().queryMetricsSetting(new ValueCallback<Boolean>() {
+            // Actions conditioned on whether the Android Checkbox is toggled on
+            public void onReceiveValue(Boolean enabled) {
+                ThreadUtils.assertOnUiThread();
+                AwMetricsServiceClient.setConsentSetting(context, enabled);
 
-                        if (!enableMinidumpUploadingForTesting) {
-                            AwBrowserProcess.handleMinidumps(webViewPackageName, enabled);
-                        }
-                    }
-                });
+                if (!enableMinidumpUploadingForTesting) {
+                    AwBrowserProcess.handleMinidumps(webViewPackageName, enabled);
+                }
+            }
+        });
 
         if (CommandLineUtil.isBuildDebuggable()) {
             setWebContentsDebuggingEnabled(true);
         }
 
         TraceEvent.setATraceEnabled(mWebViewDelegate.isTraceTagEnabled());
         mWebViewDelegate.setOnTraceEnabledChangeListener(
                 new WebViewDelegate.OnTraceEnabledChangeListener() {
                     @Override
                     public void onTraceEnabledChange(boolean enabled) {
@@ skipping 247 matching lines @@
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 
     // The method to support unreleased Android.
     WebViewContentsClientAdapter createWebViewContentsClientAdapter(WebView webView,
             Context context) {
         return new WebViewContentsClientAdapter(webView, context, mWebViewDelegate);
     }
 }