Fix and update MediaCodec blacklist.

media/base/android/media_codec_util.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 
 #include <jni.h>
 #include <set>
 #include <string>
@@ skipping 29 matching lines @@
     }                                                             \
   } while (0)
 
 class MEDIA_EXPORT MediaCodecUtil {
  public:
   // Returns true if MediaCodec is available on the device.
   // All other static methods check IsAvailable() internally. There's no need
   // to check IsAvailable() explicitly before calling them.
   static bool IsMediaCodecAvailable();
 
+  // Returns true if MediaCodec is available, with |sdk| as the sdk version and
+  // |model| as the model.  This is provided for unit tests; you probably want
+  // IsMediaCodecAvailable() otherwise.
+  // TODO(liberato): merge this with IsMediaCodecAvailable, and provide a way
+  // to mock BuildInfo instead.
+  static bool IsMediaCodecAvailableFor(int sdk, const char* model);
+
   // Returns true if MediaCodec.setParameters() is available on the device.
   static bool SupportsSetParameters();
 
   // Returns whether MediaCodecBridge has a decoder that |is_secure| and can
   // decode |codec| type.
   static bool CanDecode(const std::string& codec, bool is_secure);
 
   // Returns a vector of supported codecs profiles and levels.
   static bool AddSupportedCodecProfileLevels(
       std::vector<CodecProfileLevel>* out);
@@ skipping 33 matching lines @@
   // Indicates if the decoder is known to fail when flushed. (b/8125974,
   // b/8347958)
   // When true, the client should work around the issue by releasing the
   // decoder and instantiating a new one rather than flushing the current one.
   static bool CodecNeedsFlushWorkaround(MediaCodecBridge* codec);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_