Revert of patch suspect of causing Android GPU builds to start failing

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 69 matching lines @@
 
     // Initialization guarded by mLock.
     private AwBrowserContext mBrowserContext;
     private Statics mStaticMethods;
     private GeolocationPermissionsAdapter mGeolocationPermissions;
     private CookieManagerAdapter mCookieManager;
     private WebIconDatabaseAdapter mWebIconDatabase;
     private WebStorageAdapter mWebStorage;
     private WebViewDatabaseAdapter mWebViewDatabase;
     private AwDevToolsServer mDevToolsServer;
+    private Context mWrappedAppContext;
 
     private ArrayList<WeakReference<WebViewChromium>> mWebViewsToStart =
             new ArrayList<WeakReference<WebViewChromium>>();
 
     // Read/write protected by mLock.
     private boolean mStarted;
     private AwDataReductionProxyManager mProxyManager;
 
     private SharedPreferences mWebViewPrefs;
     private WebViewDelegate mWebViewDelegate;
 
     /**
      * Constructor called by the API 21 version of {@link WebViewFactory} and earlier.
      */
     public WebViewChromiumFactoryProvider() {
         initialize(WebViewDelegateFactory.createApi21CompatibilityDelegate());
     }
 
     /**
      * Constructor called by the API 22 version of {@link WebViewFactory} and later.
      */
     public WebViewChromiumFactoryProvider(android.webkit.WebViewDelegate delegate) {
         initialize(WebViewDelegateFactory.createProxyDelegate(delegate));
     }
 
     @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
     private void initialize(WebViewDelegate webViewDelegate) {
         mWebViewDelegate = webViewDelegate;
-
-        // WebView needs to make sure to always use the wrapped application context.
-        ContextUtils.initApplicationContext(
-                ResourcesContextWrapperFactory.get(mWebViewDelegate.getApplication()));
-
         if (isBuildDebuggable()) {
             // Suppress the StrictMode violation as this codepath is only hit on debugglable builds.
             StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
             CommandLine.initFromFile(COMMAND_LINE_FILE);
             StrictMode.setThreadPolicy(oldPolicy);
         } else {
             CommandLine.init(null);
         }
 
         ThreadUtils.setWillOverrideUiThread();
         // Load chromium library.
-        AwBrowserProcess.loadLibrary(ContextUtils.getApplicationContext());
+        AwBrowserProcess.loadLibrary(getWrappedCurrentApplicationContext());
 
         final PackageInfo packageInfo = WebViewFactory.getLoadedPackageInfo();
 
         // Load glue-layer support library.
         System.loadLibrary("webviewchromium_plat_support");
 
         // Use shared preference to check for package downgrade.
         mWebViewPrefs = mWebViewDelegate.getApplication().getSharedPreferences(
                 CHROMIUM_PREFS_NAME, Context.MODE_PRIVATE);
         int lastVersion = mWebViewPrefs.getInt(VERSION_CODE_PREF, 0);
@@ skipping 116 matching lines @@
         assert Thread.holdsLock(mLock) && ThreadUtils.runningOnUiThread();
 
         // The post-condition of this method is everything is ready, so notify now to cover all
         // return paths. (Other threads will not wake-up until we release |mLock|, whatever).
         mLock.notifyAll();
 
         if (mStarted) {
             return;
         }
 
-        Context context = ContextUtils.getApplicationContext();
+        Context context = getWrappedCurrentApplicationContext();
         try {
             LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitialized(context);
         } 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");
 
         // Make sure that ResourceProvider is initialized before starting the browser process.
@@ skipping 37 matching lines @@
     boolean hasStarted() {
         return mStarted;
     }
 
     void startYourEngines(boolean onMainThread) {
         synchronized (mLock) {
             ensureChromiumStartedLocked(onMainThread);
         }
     }
 
+    private Context getWrappedCurrentApplicationContext() {
+        if (mWrappedAppContext == null) {
+            mWrappedAppContext = ResourcesContextWrapperFactory.get(
+                    mWebViewDelegate.getApplication());
+        }
+        return mWrappedAppContext;
+    }
+
     AwBrowserContext getBrowserContext() {
         synchronized (mLock) {
             return getBrowserContextLocked();
         }
     }
 
     private AwBrowserContext getBrowserContextLocked() {
         assert Thread.holdsLock(mLock);
         assert mStarted;
         if (mBrowserContext == null) {
             mBrowserContext =
-                    new AwBrowserContext(mWebViewPrefs, ContextUtils.getApplicationContext());
+                    new AwBrowserContext(mWebViewPrefs, getWrappedCurrentApplicationContext());
         }
         return mBrowserContext;
     }
 
     private void setWebContentsDebuggingEnabled(boolean enable) {
         if (Looper.myLooper() != ThreadUtils.getUiThreadLooper()) {
             throw new RuntimeException(
                     "Toggling of Web Contents Debugging must be done on the UI thread");
         }
         if (mDevToolsServer == null) {
@@ skipping 89 matching lines @@
                         getBrowserContextLocked().getGeolocationPermissions());
             }
         }
         return mGeolocationPermissions;
     }
 
     @Override
     public CookieManager getCookieManager() {
         synchronized (mLock) {
             if (mCookieManager == null) {
+                if (!mStarted) {
+                    // We can use CookieManager without starting Chromium; the native code
+                    // will bring up just the parts it needs to make this work on a temporary
+                    // basis until Chromium is started for real. The temporary cookie manager
+                    // needs the application context to have been set.
+                    ContextUtils.initApplicationContext(getWrappedCurrentApplicationContext());
+                }
                 mCookieManager = new CookieManagerAdapter(new AwCookieManager());
             }
         }
         return mCookieManager;
     }
 
     @Override
     public android.webkit.WebIconDatabase getWebIconDatabase() {
         synchronized (mLock) {
             if (mWebIconDatabase == null) {
@@ skipping 25 matching lines @@
                         browserContext.getHttpAuthDatabase(context));
             }
         }
         return mWebViewDatabase;
     }
 
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 }