Reland "Android: Remove GetApplicationContext part 2"

chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.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.chrome.browser.media.router;
 
-import android.content.Context;
 import android.support.v7.media.MediaRouter;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.SysUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.media.router.cast.CastMediaRouteProvider;
 import org.chromium.chrome.browser.media.router.cast.MediaSink;
 import org.chromium.chrome.browser.media.router.cast.MediaSource;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ skipping 45 matching lines @@
         return mSinksPerSourcePerProvider;
     }
 
     @VisibleForTesting
     protected Map<String, List<MediaSink>> getSinksPerSourceForTest() {
         return mSinksPerSource;
     }
 
     /**
      * Obtains the {@link MediaRouter} instance given the application context.
-     * @param applicationContext The context to get the Android media router service for.
      * @return Null if the media router API is not supported, the service instance otherwise.
      */
     @Nullable
-    public static MediaRouter getAndroidMediaRouter(Context applicationContext) {
+    public static MediaRouter getAndroidMediaRouter() {
         try {
             // Pre-MR1 versions of JB do not have the complete MediaRouter APIs,
             // so getting the MediaRouter instance will throw an exception.
-            return MediaRouter.getInstance(applicationContext);
+            return MediaRouter.getInstance(ContextUtils.getApplicationContext());
         } catch (NoSuchMethodError e) {
             return null;
         } catch (NoClassDefFoundError e) {
             // TODO(mlamouri): happens with Robolectric.
             return null;
         }
     }
 
     @Override
     public void onSinksReceived(
@@ skipping 57 matching lines @@
     }
 
     @Override
     public void onMessage(String mediaRouteId, String message) {
         nativeOnMessage(mNativeMediaRouterAndroid, mediaRouteId, message);
     }
 
     /**
      * Initializes the media router and its providers.
      * @param nativeMediaRouterAndroid the handler for the native counterpart of this instance
-     * @param applicationContext the application context to use to obtain system APIs
      * @return an initialized {@link ChromeMediaRouter} instance
      */
     @CalledByNative
-    public static ChromeMediaRouter create(long nativeMediaRouterAndroid,
-            Context applicationContext) {
+    public static ChromeMediaRouter create(long nativeMediaRouterAndroid) {
         ChromeMediaRouter router = new ChromeMediaRouter(nativeMediaRouterAndroid);
-        MediaRouteProvider provider = sRouteProviderBuilder.create(applicationContext, router);
+        MediaRouteProvider provider = sRouteProviderBuilder.create(router);
         if (provider != null) router.addMediaRouteProvider(provider);
 
         return router;
     }
 
     /**
      * Starts background monitoring for available media sinks compatible with the given
      * |sourceUrn| if the device is in a state that allows it.
      * @param sourceId a URL to use for filtering of the available media sinks
      * @return whether the monitoring started (ie. was allowed).
@@ skipping 180 matching lines @@
             boolean wasLaunched);
     native void nativeOnRouteRequestError(
             long nativeMediaRouterAndroid, String errorText, int createRouteRequestId);
     native void nativeOnRouteClosed(long nativeMediaRouterAndroid, String mediaRouteId);
     native void nativeOnRouteClosedWithError(
             long nativeMediaRouterAndroid, String mediaRouteId, String message);
     native void nativeOnMessageSentResult(
             long nativeMediaRouterAndroid, boolean success, int callbackId);
     native void nativeOnMessage(long nativeMediaRouterAndroid, String mediaRouteId, String message);
 }