Revert of Android: Remove GetApplicationContext part 2

android_webview/java/src/org/chromium/android_webview/PlatformServiceBridge.java

 // Copyright 2015 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 org.chromium.android_webview;
 
 import android.content.Context;
 import android.webkit.ValueCallback;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 
 import java.lang.reflect.InvocationTargetException;
 
 /**
  * This class manages platform-specific services. (i.e. Google Services) The platform
  * should extend this class and use this base class to fetch their specialized version.
  */
 public class PlatformServiceBridge {
     private static final String TAG = "PlatformServiceBrid-";
     private static final String PLATFORM_SERVICE_BRIDGE =
             "com.android.webview.chromium.PlatformServiceBridgeGoogle";
 
     // Only written by getOrCreateInstance on the UI thread (aside from injectInstance, for
     // testing), but read by getInstance on arbitrary threads.
     private static volatile PlatformServiceBridge sInstance;
 
     protected PlatformServiceBridge() {}
 
-    public static PlatformServiceBridge getOrCreateInstance() {
+    public static PlatformServiceBridge getOrCreateInstance(Context context) {
         // Just to avoid race conditions on sInstance - nothing special about the UI thread.
         ThreadUtils.assertOnUiThread();
 
         if (sInstance != null) return sInstance;
 
         // Try to get a specialized service bridge.
         try {
             Class<?> cls = Class.forName(PLATFORM_SERVICE_BRIDGE);
             sInstance = (PlatformServiceBridge) cls.getDeclaredConstructor(Context.class)
-                                .newInstance(ContextUtils.getApplicationContext());
+                                .newInstance(context);
             return sInstance;
         } catch (ClassNotFoundException e) {
             // This is not an error; it just means this device doesn't have specialized
             // services.
         } catch (IllegalAccessException | IllegalArgumentException | InstantiationException
                 | NoSuchMethodException e) {
             Log.e(TAG, "Failed to get " + PLATFORM_SERVICE_BRIDGE + ": " + e);
         } catch (InvocationTargetException e) {
             Log.e(TAG, "Failed invocation to get " + PLATFORM_SERVICE_BRIDGE + ":", e.getCause());
         }
@@ skipping 28 matching lines @@
     // because of any technical limitation) we require that "queryMetricsSetting" and "callback"
     // both get called on WebView's UI thread.
     public void queryMetricsSetting(ValueCallback<Boolean> callback) {
         ThreadUtils.assertOnUiThread();
         callback.onReceiveValue(false);
     }
 
     // Takes an uncompressed, serialized UMA proto and logs it via a platform-specific mechanism.
     public void logMetrics(byte[] data) {}
 }