Fix CTS webkit.WebViewHostSideStartupTest#testStrictMode

This patch only fix one violation caused by
WebViewChromiumFactoryProvider.initialize()

Bug: 857121
Change-Id: Ida7d2b3df4e0e7c96f69e42e0b766dde976b2c3a
Reviewed-on: https://chromium-review.googlesource.com/1117268
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570931}

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

@@ -11,7 +11,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.os.StrictMode;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -44,6 +43,7 @@ import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.PackageUtils;
 import org.chromium.base.PathUtils;
+import org.chromium.base.StrictModeContext;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.NativeLibraries;
 import org.chromium.base.metrics.CachedMetrics.TimesHistogramSample;
@@ -173,7 +173,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
     }
 
     private void deleteContentsOnPackageDowngrade(PackageInfo packageInfo) {
-        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
         try (ScopedSysTraceEvent e2 = ScopedSysTraceEvent.scoped(
                      "WebViewChromiumFactoryProvider.deleteContentsOnPackageDowngrade")) {
             // Use shared preference to check for package downgrade.
@@ -195,8 +194,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
             if (lastVersion != currentVersion) {
                 mWebViewPrefs.edit().putInt(VERSION_CODE_PREF, currentVersion).apply();
             }
-        } finally {
-            StrictMode.setThreadPolicy(oldPolicy);
         }
     }
 
@@ -262,21 +259,23 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
             ThreadUtils.setWillOverrideUiThread();
             BuildInfo.setBrowserPackageInfo(packageInfo);
 
-            try (ScopedSysTraceEvent e2 = ScopedSysTraceEvent.scoped(
-                         "WebViewChromiumFactoryProvider.loadChromiumLibrary")) {
-                String dataDirectorySuffix = null;
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                    dataDirectorySuffix = mWebViewDelegate.getDataDirectorySuffix();
+            try (StrictModeContext smc = StrictModeContext.allowDiskWrites()) {
+                try (ScopedSysTraceEvent e2 = ScopedSysTraceEvent.scoped(
+                             "WebViewChromiumFactoryProvider.loadChromiumLibrary")) {
+                    String dataDirectorySuffix = null;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        dataDirectorySuffix = mWebViewDelegate.getDataDirectorySuffix();
+                    }
+                    AwBrowserProcess.loadLibrary(dataDirectorySuffix);
                 }
-                AwBrowserProcess.loadLibrary(dataDirectorySuffix);
-            }
 
-            try (ScopedSysTraceEvent e2 = ScopedSysTraceEvent.scoped(
-                         "WebViewChromiumFactoryProvider.loadGlueLayerPlatSupportLibrary")) {
-                System.loadLibrary("webviewchromium_plat_support");
-            }
+                try (ScopedSysTraceEvent e2 = ScopedSysTraceEvent.scoped(
+                             "WebViewChromiumFactoryProvider.loadGlueLayerPlatSupportLibrary")) {
+                    System.loadLibrary("webviewchromium_plat_support");
+                }
 
-            deleteContentsOnPackageDowngrade(packageInfo);
+                deleteContentsOnPackageDowngrade(packageInfo);
+            }
 
             // Now safe to use WebView data directory.