Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer."

media/base/android/media_codec_util.h

Index: media/base/android/media_codec_util.h
diff --git a/media/base/android/media_codec_util.h b/media/base/android/media_codec_util.h
index e1fcb1844b42b9669f8e988680ca7aea593daab7..6dfd13c825a53753d778a830b56936a3766a39fe 100644
--- a/media/base/android/media_codec_util.h
+++ b/media/base/android/media_codec_util.h
@@ -66,11 +66,11 @@ class MEDIA_EXPORT MediaCodecUtil {
   static bool IsKnownUnaccelerated(const std::string& mime_type,
                                    MediaCodecDirection direction);
 
-  // Test whether the path of a URL ends with ".m3u8".
-  static bool IsHLSURL(const GURL& url);
-
   // Test whether a URL contains "m3u8". (Using exactly the same logic as
   // NuPlayer does to determine if a stream is HLS.)
+  static bool IsHLSURL(const GURL& url);
+
+  // Test whether the path of a URL ends with ".m3u8".
   static bool IsHLSPath(const GURL& url);
 
   static bool RegisterMediaCodecUtil(JNIEnv* env);