Remove uses of deprecated Header class

chrome/android/java/src/org/chromium/chrome/browser/media/remote/DefaultMediaRouteController.java

 // Copyright 2012 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.remote;
 
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.v7.media.MediaControlIntent;
 import android.support.v7.media.MediaItemMetadata;
 import android.support.v7.media.MediaItemStatus;
 import android.support.v7.media.MediaRouteSelector;
 import android.support.v7.media.MediaRouter;
 import android.support.v7.media.MediaRouter.RouteInfo;
 import android.support.v7.media.MediaSessionStatus;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.google.android.gms.cast.CastMediaControlIntent;
 
-import org.apache.http.Header;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CommandLine;
 import org.chromium.chrome.ChromeSwitches;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.media.remote.RemoteVideoInfo.PlayerState;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Nullable;
 
 /**
  * Class that abstracts all communication to and from the Android MediaRoutes. This class is
  * responsible for connecting to the MRs as well as sending commands and receiving status updates
  * from the remote player.
  *
  *  We have three main scenarios for Cast:
  *
@@ skipping 39 matching lines @@
         void onError(String message, Bundle data);
     }
 
     private static final String TAG = "DefaultMediaRouteController";
 
     private static final String ACTION_RECEIVE_SESSION_STATUS_UPDATE =
             "com.google.android.apps.chrome.videofling.RECEIVE_SESSION_STATUS_UPDATE";
     private static final String ACTION_RECEIVE_MEDIA_STATUS_UPDATE =
             "com.google.android.apps.chrome.videofling.RECEIVE_MEDIA_STATUS_UPDATE";
     private static final String MIME_TYPE = "video/mp4";
+    private static final String CORS_HEADER_NAME = "Access-Control-Allow-Origin";
 
     private boolean mDebug;
     private String mCurrentSessionId;
     private String mCurrentItemId;
     private int mStreamPositionTimestamp;
     private int mLastKnownStreamPosition;
     private int mStreamDuration;
     private boolean mSeeking;
     private final String mIntentCategory;
     private PendingIntent mSessionStatusUpdateIntent;
@@ skipping 43 matching lines @@
                 public Uri getUri() {
                     return mLocalVideoUri;
                 }
 
                 @Override
                 public String getCookies() {
                     return mLocalVideoCookies;
                 }
 
                 @Override
-                public void setUri(Uri uri, Header[] headers) {
+                public void setUri(Uri uri, Map<String, List<String>> headers) {
                     if (canPlayMedia(uri, headers)) {
                         mLocalVideoUri = uri;
                         playMedia();
                         return;
                     }
                     mLocalVideoUri = null;
                     showMessageToast(
                             getContext().getString(R.string.cast_permission_error_playing_video));
                     release();
                 }
@@ skipping 870 matching lines @@
         if (mMediaUrlResolver != null) mMediaUrlResolver.cancel(true);
 
         // Create a new MediaUrlResolver since the previous one may still be running despite the
         // cancel() call.
         mMediaUrlResolver = new MediaUrlResolver(getContext(), mMediaUrlResolverDelegate);
 
         mStartPositionMillis = startPositionMillis;
         mMediaUrlResolver.execute();
     }
 
-    private boolean canPlayMedia(Uri uri, Header[] headers) {
+    private boolean canPlayMedia(Uri uri, Map<String, List<String>> headers) {

[whywhat, 2015/03/30 15:51:34]

As I explain in the other comment I'd rather move this into the
MediaUrlResolver. One extra reason would be that there's a method with the same
name but different arguments in this class and its confusing.

[aberent, 2015/03/30 17:24:04]

Done.

         if (uri == Uri.EMPTY) return false;
 
         // HLS media requires Cors headers. Since these are the only ones
         // sent now we can just check that headers is not empty but
         // if more headers are added we should be more strict in the check.
-        if ((headers == null || headers.length == 0) && isEnhancedMedia(uri)) {
+        if ((headers == null || !headers.containsKey(CORS_HEADER_NAME)) && isEnhancedMedia(uri)) {
             if (mDebug) Log.d(TAG, "HLS stream without CORs header: " + uri);
             return false;
         }
         return true;
     }
 
     private void playMedia() {
         String title = getMediaStateListener().getTitle();
         playUri(mLocalVideoUri, title, mStartPositionMillis);
     }
@@ skipping 25 matching lines @@
             return SMOOTHSTREAM_MEDIA;
         }
         return UNKNOWN_MEDIA;
     }
 
     private boolean isEnhancedMedia(Uri videoUri) {
         int mediaType = getMediaType(videoUri);
         return mediaType == HLS_MEDIA || mediaType == DASH_MEDIA || mediaType == SMOOTHSTREAM_MEDIA;
     }
 }