🍳 Fix and clean up application context in webview.

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

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 78d1bdcabeb8e39be0ff8ac08e014620d0efb23a..98fd7eeb58d1bcc4bcdc7378d36cec8975f8e911 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
@@ -121,7 +121,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
                 ResourcesContextWrapperFactory.get(mWebViewDelegate.getApplication()));

[boliu, 2016/06/16 21:09:46]

came here to say should add getApplicationContext here, as we discussed:
https://bugs.chromium.org/p/chromium/issues/detail?id=620790#c5 and #c6

will let torne review the rest :p

[Peter Wen, 2016/06/16 21:29:03]

Done.

 
         if (isBuildDebuggable()) {
-            // Suppress the StrictMode violation as this codepath is only hit on debugglable builds.
+            // Suppress the StrictMode violation as this codepath is only hit on debuggable builds.
             StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
             CommandLine.initFromFile(COMMAND_LINE_FILE);
             StrictMode.setThreadPolicy(oldPolicy);
@@ -131,7 +131,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
 
         ThreadUtils.setWillOverrideUiThread();
         // Load chromium library.
-        AwBrowserProcess.loadLibrary(ContextUtils.getApplicationContext());
+        AwBrowserProcess.loadLibrary();
 
         final PackageInfo packageInfo = WebViewFactory.getLoadedPackageInfo();
 
@@ -139,14 +139,14 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         System.loadLibrary("webviewchromium_plat_support");
 
         // Use shared preference to check for package downgrade.
-        mWebViewPrefs = mWebViewDelegate.getApplication().getSharedPreferences(
+        mWebViewPrefs = ContextUtils.getApplicationContext().getSharedPreferences(
                 CHROMIUM_PREFS_NAME, Context.MODE_PRIVATE);
         int lastVersion = mWebViewPrefs.getInt(VERSION_CODE_PREF, 0);
         int currentVersion = packageInfo.versionCode;
         if (!versionCodeGE(currentVersion, lastVersion)) {
             // The WebView package has been downgraded since we last ran in this application.
             // Delete the WebView data directory's contents.
-            String dataDir = PathUtils.getDataDirectory(mWebViewDelegate.getApplication());
+            String dataDir = PathUtils.getDataDirectory(ContextUtils.getApplicationContext());
             Log.i(TAG, "WebView package downgraded from " + lastVersion + " to " + currentVersion
                             + "; deleting contents of " + dataDir);
             deleteContents(new File(dataDir));
@@ -286,7 +286,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         initNetworkChangeNotifier(context);
         final int extraBindFlags = 0;
         AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, extraBindFlags);
-        AwBrowserProcess.start(context);
+        AwBrowserProcess.start();
 
         if (isBuildDebuggable()) {
             setWebContentsDebuggingEnabled(true);
@@ -313,7 +313,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
 
         // Start listening for data reduction proxy setting changes.
         mProxyManager = new AwDataReductionProxyManager();
-        mProxyManager.start(mWebViewDelegate.getApplication());
+        mProxyManager.start(ContextUtils.getApplicationContext());
     }
 
     boolean hasStarted() {