| Index: chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
|
| index a4e96c4da74363269c4981d97656b72dc3bee6f7..63675319990dea464958f2b487e6620d2b2e0a0e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
|
| @@ -4,9 +4,9 @@
|
|
|
| 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;
|
| @@ -72,15 +72,14 @@ public class ChromeMediaRouter implements MediaRouteManager {
|
|
|
| /**
|
| * 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) {
|
| @@ -158,14 +157,12 @@ public class ChromeMediaRouter implements MediaRouteManager {
|
| /**
|
| * 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;
|
|
|