Prepare to call GMS APIs from WebView

android_webview/java/src/org/chromium/android_webview/AwMetricsServiceClient.java

Index: android_webview/java/src/org/chromium/android_webview/AwMetricsServiceClient.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwMetricsServiceClient.java b/android_webview/java/src/org/chromium/android_webview/AwMetricsServiceClient.java
index 09173a39b45da3a2d45903427ec6c20f4a294cf2..fde3c080dc93b183ae890ef2e2f78c4636bf17b1 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwMetricsServiceClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwMetricsServiceClient.java
@@ -25,10 +25,10 @@ public class AwMetricsServiceClient {
     // reporting. See https://developer.android.com/reference/android/webkit/WebView.html
     private static final String OPT_OUT_META_DATA_STR = "android.webkit.WebView.MetricsOptOut";
 
-    private static boolean isAppOptedOut(Context applicationContext) {
+    private static boolean isAppOptedOut(Context appContext) {
         try {
-            ApplicationInfo info = applicationContext.getPackageManager().getApplicationInfo(
-                    applicationContext.getPackageName(), PackageManager.GET_META_DATA);
+            ApplicationInfo info = appContext.getPackageManager().getApplicationInfo(
+                    appContext.getPackageName(), PackageManager.GET_META_DATA);
             if (info.metaData == null) {
                 // null means no such tag was found.
                 return false;
@@ -43,14 +43,14 @@ public class AwMetricsServiceClient {
         }
     }
 
-    public AwMetricsServiceClient(Context applicationContext) {
-        if (isAppOptedOut(applicationContext)) {
+    public AwMetricsServiceClient(Context appContext) {
+        if (isAppOptedOut(appContext)) {
             return;
         }
 
         // Check if the user has consented.
-        PlatformServiceBridge.getInstance(applicationContext)
-                .setMetricsSettingListener(new ValueCallback<Boolean>() {
+        PlatformServiceBridge.getInstance(appContext)
+                .queryMetricsEnabled(new ValueCallback<Boolean>() {
                     public void onReceiveValue(Boolean enabled) {
                         nativeSetMetricsEnabled(enabled);
                     }