Android: Remove GetApplicationContext for cast

base/android/context_utils.* is being removed.

Java-side already has the ContextUtils#GetApplicationContext global and
no longer needs native to hold the pointer and pass it through jni with
every call that needs an application context.

BUG=646094

Review-Url: https://codereview.chromium.org/2807263002
Cr-Commit-Position: refs/heads/master@{#463384}

chromecast/app/android/crash_handler.cc

@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <string>
 
-#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
@@ -91,9 +90,8 @@ void CrashHandler::InitializeUploader() {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> crash_dump_path_java =
       base::android::ConvertUTF8ToJavaString(env, crash_dump_path_.value());
-  Java_CastCrashHandler_initializeUploader(
-      env, base::android::GetApplicationContext(), crash_dump_path_java,
-      UploadCrashToStaging());
+  Java_CastCrashHandler_initializeUploader(env, crash_dump_path_java,
+                                           UploadCrashToStaging());
 }
 
 }  // namespace chromecast

chromecast/base/android/system_time_change_notifier_android.cc

@@ -4,7 +4,6 @@
 
 #include "chromecast/base/android/system_time_change_notifier_android.h"
 
-#include "base/android/context_utils.h"
 #include "jni/SystemTimeChangeNotifierAndroid_jni.h"
 
 using base::android::JavaParamRef;
@@ -24,8 +23,7 @@ SystemTimeChangeNotifierAndroid::~SystemTimeChangeNotifierAndroid() {
 
 void SystemTimeChangeNotifierAndroid::Initialize() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  java_notifier_.Reset(Java_SystemTimeChangeNotifierAndroid_create(
-      env, base::android::GetApplicationContext()));
+  java_notifier_.Reset(Java_SystemTimeChangeNotifierAndroid_create(env));
   Java_SystemTimeChangeNotifierAndroid_initializeFromNative(
       env, java_notifier_, reinterpret_cast<jlong>(this));
 }

chromecast/base/chromecast_config_android.cc

@@ -4,7 +4,6 @@
 
 #include "chromecast/base/chromecast_config_android.h"
 
-#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/lazy_instance.h"
 #include "jni/ChromecastConfigAndroid_jni.h"
@@ -39,8 +38,7 @@ bool ChromecastConfigAndroid::CanSendUsageStats() {
   // TODO(gunsch): make opt-in.stats pref the source of truth for this data,
   // instead of Android prefs, then delete ChromecastConfigAndroid.
   JNIEnv* env = base::android::AttachCurrentThread();
-  return Java_ChromecastConfigAndroid_canSendUsageStats(
-      env, base::android::GetApplicationContext());
+  return Java_ChromecastConfigAndroid_canSendUsageStats(env);
 }
 
 // Registers a handler to be notified when SendUsageStats is changed.

chromecast/base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java

@@ -17,10 +17,9 @@ public final class ChromecastConfigAndroid {
 
     private static CastSettingsManager sSettingsManager;
 
-    public static void initializeForBrowser(Context applicationContext) {
+    public static void initializeForBrowser(Context context) {
         sSettingsManager = CastSettingsManager.createCastSettingsManager(
-                applicationContext,
-                new CastSettingsManager.OnSettingChangedListener() {
+                context, new CastSettingsManager.OnSettingChangedListener() {
                     @Override
                     public void onSendUsageStatsChanged(boolean enabled) {
                         nativeSetSendUsageStatsEnabled(enabled);
@@ -29,7 +28,7 @@ public final class ChromecastConfigAndroid {
     }
 
     @CalledByNative
-    public static boolean canSendUsageStats(Context context) {
+    public static boolean canSendUsageStats() {
         return sSettingsManager.isSendUsageStatsEnabled();
     }
 

chromecast/base/java/src/org/chromium/chromecast/base/SystemTimeChangeNotifierAndroid.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
@@ -18,17 +19,14 @@ import org.chromium.base.annotations.JNINamespace;
  */
 @JNINamespace("chromecast")
 public final class SystemTimeChangeNotifierAndroid {
-    private final Context mContext;
     private BroadcastReceiver mTimeChangeObserver;
 
     @CalledByNative
-    private static SystemTimeChangeNotifierAndroid create(Context context) {
-        return new SystemTimeChangeNotifierAndroid(context);
+    private static SystemTimeChangeNotifierAndroid create() {
+        return new SystemTimeChangeNotifierAndroid();
     }
 
-    private SystemTimeChangeNotifierAndroid(Context context) {
-        mContext = context;
-    }
+    private SystemTimeChangeNotifierAndroid() {}
 
     @CalledByNative
     private void initializeFromNative(final long nativeSystemTimeChangeNotifier) {
@@ -40,11 +38,11 @@ public final class SystemTimeChangeNotifierAndroid {
             }
         };
         IntentFilter filter = new IntentFilter(Intent.ACTION_TIME_CHANGED);
-        mContext.registerReceiver(mTimeChangeObserver, filter);
+        ContextUtils.getApplicationContext().registerReceiver(mTimeChangeObserver, filter);
     }
 
     @CalledByNative private void finalizeFromNative() {
-        mContext.unregisterReceiver(mTimeChangeObserver);
+        ContextUtils.getApplicationContext().unregisterReceiver(mTimeChangeObserver);
         mTimeChangeObserver = null;
     }
 

chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java

@@ -4,8 +4,6 @@
 
 package org.chromium.chromecast.shell;
 
-import android.content.Context;
-
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
@@ -19,10 +17,9 @@ public final class CastCrashHandler {
     private static final String TAG = "cr_CastCrashHandler";
 
     @CalledByNative
-    public static void initializeUploader(Context context, String crashDumpPath,
-            boolean uploadCrashToStaging) {
+    public static void initializeUploader(String crashDumpPath, boolean uploadCrashToStaging) {
         CastCrashUploader uploader = new CastCrashUploader(crashDumpPath, uploadCrashToStaging);
-        if (ChromecastConfigAndroid.canSendUsageStats(context)) {
+        if (ChromecastConfigAndroid.canSendUsageStats()) {
             uploader.startPeriodicUpload();
         } else {
             Log.d(TAG, "Removing crash dumps instead of uploading");