Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
index 0f3ab07cf519291bc114f589f4ff973deb0a6e9e..9736f58645fbd4dd1b9db94ec753e5d8e92c928c 100644 |
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
@@ -23,7 +23,6 @@ import android.webkit.CookieManager; |
import android.webkit.GeolocationPermissions; |
import android.webkit.ServiceWorkerController; |
import android.webkit.TokenBindingService; |
-import android.webkit.ValueCallback; |
import android.webkit.WebStorage; |
import android.webkit.WebView; |
import android.webkit.WebViewDatabase; |
@@ -40,7 +39,6 @@ import org.chromium.android_webview.AwContentsClient; |
import org.chromium.android_webview.AwContentsStatics; |
import org.chromium.android_webview.AwCookieManager; |
import org.chromium.android_webview.AwDevToolsServer; |
-import org.chromium.android_webview.AwMetricsServiceClient; |
import org.chromium.android_webview.AwNetworkChangeNotifierRegistrationPolicy; |
import org.chromium.android_webview.AwQuotaManagerBridge; |
import org.chromium.android_webview.AwResource; |
@@ -414,24 +412,9 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { |
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 */); |
- } |
- |
- 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); |
- } |
- } |
- }); |
+ AwBrowserProcess.setWebViewPackageName(webViewPackageName); |
gsennton
2017/04/20 20:32:46
AwBrowserProcess.setWebViewPackageName must be cal
gsennton
2017/04/24 12:39:54
Done, the render process is set up in configureChi
|
+ AwBrowserProcess.handleMinidumpsAndSetMetricsConsent( |
+ webViewPackageName, true /* updateMetricsConsent */); |
if (CommandLineUtil.isBuildDebuggable()) { |
setWebContentsDebuggingEnabled(true); |