Android: Remove GetApplicationContext part 2

chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastMediaRouteProvider.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.cast;
 
-import android.content.Context;
 import android.os.Handler;
 import android.support.v7.media.MediaRouteSelector;
 import android.support.v7.media.MediaRouter;
 import android.support.v7.media.MediaRouter.RouteInfo;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
@@ skipping 15 matching lines @@
 /**
  * A {@link MediaRouteProvider} implementation for Cast devices and applications.
  */
 public class CastMediaRouteProvider implements MediaRouteProvider, DiscoveryDelegate {
 
     private static final String TAG = "MediaRouter";
 
     private static final String AUTO_JOIN_PRESENTATION_ID = "auto-join";
     private static final String PRESENTATION_ID_SESSION_ID_PREFIX = "cast-session_";
 
-    private final Context mApplicationContext;
     private final MediaRouter mAndroidMediaRouter;
     private final MediaRouteManager mManager;
     private final CastMessageHandler mMessageHandler;
     private final Map<String, DiscoveryCallback> mDiscoveryCallbacks =
             new HashMap<String, DiscoveryCallback>();
     private final Map<String, MediaRoute> mRoutes = new HashMap<String, MediaRoute>();
     private ClientRecord mLastRemovedRouteRecord;
     private final Map<String, ClientRecord> mClientRecords = new HashMap<String, ClientRecord>();
 
     // There can be only one Cast session at the same time on Android.
     private CastSession mSession;
     private CreateRouteRequest mPendingCreateRouteRequest;
     private Handler mHandler = new Handler();
 
     /**
      * Builder class for {@link CastMediaRouteProvider}.
      */
     public static class Builder implements MediaRouteProvider.Builder {
         @Override
-        public MediaRouteProvider create(Context applicationContext, MediaRouteManager manager) {
-            return CastMediaRouteProvider.create(applicationContext, manager);
+        public MediaRouteProvider create(MediaRouteManager manager) {
+            return CastMediaRouteProvider.create(manager);
         }
     }
 
     private static class OnSinksReceivedRunnable implements Runnable {
 
         private final WeakReference<MediaRouteManager> mRouteManager;
         private final MediaRouteProvider mRouteProvider;
         private final String mSourceId;
         private final List<MediaSink> mSinks;
 
         OnSinksReceivedRunnable(MediaRouteManager manager, MediaRouteProvider routeProvider,
                 String sourceId, List<MediaSink> sinks) {
             mRouteManager = new WeakReference<MediaRouteManager>(manager);
             mRouteProvider = routeProvider;
             mSourceId = sourceId;
             mSinks = sinks;
         }
 
         @Override
         public void run() {
             MediaRouteManager manager = mRouteManager.get();
             if (manager != null) manager.onSinksReceived(mSourceId, mRouteProvider, mSinks);
         }
     }
 
     /**
-     * @param applicationContext The application context to use for this route provider.
      * @return Initialized {@link CastMediaRouteProvider} object or null if it's not supported.
      */
     @Nullable
-    public static CastMediaRouteProvider create(
-            Context applicationContext, MediaRouteManager manager) {
-        assert applicationContext != null;
-        MediaRouter androidMediaRouter =
-                ChromeMediaRouter.getAndroidMediaRouter(applicationContext);
+    public static CastMediaRouteProvider create(MediaRouteManager manager) {
+        MediaRouter androidMediaRouter = ChromeMediaRouter.getAndroidMediaRouter();
         if (androidMediaRouter == null) return null;
 
-        return new CastMediaRouteProvider(applicationContext, androidMediaRouter, manager);
+        return new CastMediaRouteProvider(androidMediaRouter, manager);
     }
 
     public void onLaunchError() {
         for (String routeId : mRoutes.keySet()) {
             mManager.onRouteClosedWithError(routeId, "Launch error");
         }
         mRoutes.clear();
         mClientRecords.clear();
     }
 
@@ skipping 169 matching lines @@
                 sink.getId(), source.getUrn(), request.getPresentationId());
         addRoute(route, request.getOrigin(), request.getTabId());
         mManager.onRouteCreated(route.id, route.sinkId, request.getNativeRequestId(), this, true);
 
         if (source.getClientId() != null) {
             ClientRecord clientRecord = mClientRecords.get(source.getClientId());
             if (clientRecord != null) {
                 sendReceiverAction(clientRecord.routeId, sink, source.getClientId(), "cast");
             }
         }
-        request.start(mApplicationContext);
+        request.start();
     }
 
     @Override
     public void joinRoute(String sourceId, String presentationId, String origin, int tabId,
             int nativeRequestId) {
         MediaSource source = MediaSource.from(sourceId);
         if (source == null || source.getClientId() == null) {
             mManager.onRouteRequestError("Unsupported presentation URL", nativeRequestId);
             return;
         }
@@ skipping 143 matching lines @@
         JSONObject jsonMessage = new JSONObject();
         jsonMessage.put("type", type);
         jsonMessage.put("sequenceNumber", sequenceNumber);
         jsonMessage.put("timeoutMillis", 0);
         jsonMessage.put("clientId", clientId);
         jsonMessage.put("message", message);
         return jsonMessage.toString();
     }
 
     @VisibleForTesting
-    static CastMediaRouteProvider createCastMediaRouteProviderForTest(
-            Context applicationContext, MediaRouter androidMediaRouter, MediaRouteManager manager) {
-        return new CastMediaRouteProvider(applicationContext, androidMediaRouter, manager);
-    }
-
-    @VisibleForTesting
-    CastMediaRouteProvider(
-            Context applicationContext, MediaRouter androidMediaRouter, MediaRouteManager manager) {
-        mApplicationContext = applicationContext;
+    CastMediaRouteProvider(MediaRouter androidMediaRouter, MediaRouteManager manager) {
         mAndroidMediaRouter = androidMediaRouter;
         mManager = manager;
         mMessageHandler = new CastMessageHandler(this);
     }
 
     @Nullable
     private boolean canAutoJoin(MediaSource source, String origin, int tabId) {
         if (source.getAutoJoinPolicy().equals(MediaSource.AUTOJOIN_PAGE_SCOPED)) return false;
 
         MediaSource currentSource = MediaSource.from(mSession.getSourceId());
@@ skipping 90 matching lines @@
         }
     }
 
     private void removeClient(@Nullable ClientRecord client) {
         if (client == null) return;
 
         mLastRemovedRouteRecord = client;
         mClientRecords.remove(client.clientId);
     }
 }