Fix and update MediaCodec blacklist.

media/base/android/media_codec_util_unittest.cc

Index: media/base/android/media_codec_util_unittest.cc
diff --git a/media/base/android/media_codec_util_unittest.cc b/media/base/android/media_codec_util_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1be15b1bcfa71da06a9188bb0e91122656b9c692
--- /dev/null
+++ b/media/base/android/media_codec_util_unittest.cc
@@ -0,0 +1,86 @@
+// Copyright 2017 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.
+
+#include "media/base/android/media_codec_util.h"
+#include "base/android/build_info.h"
+#include "base/macros.h"
+//#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+/*
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::Eq;
+using ::testing::Field;
+using ::testing::InSequence;
+using ::testing::Mock;
+using ::testing::Return;
+using ::testing::SetArgPointee;
+using ::testing::StrictMock;
+*/
+
+namespace media {
+
+// These will come from mockable BuildInfo, once it exists.
+using base::android::SDK_VERSION_JELLY_BEAN;
+using base::android::SDK_VERSION_JELLY_BEAN_MR1;
+using base::android::SDK_VERSION_JELLY_BEAN_MR2;
+using base::android::SDK_VERSION_KITKAT;
+using base::android::SDK_VERSION_LOLLIPOP;
+using base::android::SDK_VERSION_LOLLIPOP_MR1;
+using base::android::SDK_VERSION_MARSHMALLOW;
+using base::android::SDK_VERSION_NOUGAT;
+
+class MediaCodecUtilTest : public testing::Test {
+ public:
+  MediaCodecUtilTest() {}
+  ~MediaCodecUtilTest() override {}
+
+ public:
+  DISALLOW_COPY_AND_ASSIGN(MediaCodecUtilTest);
+};
+
+TEST_F(MediaCodecUtilTest, TestCodecAvailableIfNewerVersion) {
+  // Test models that should be available above some sdk level.
+  struct {
+    const char* model;
+    int last_bad_sdk;
+  } devices[] = {{"LGMS330", SDK_VERSION_LOLLIPOP_MR1},
+
+                 {"GT-I9100", SDK_VERSION_KITKAT},
+                 {"GT-I9300", SDK_VERSION_KITKAT},
+                 {"GT-N7000", SDK_VERSION_KITKAT},
+                 {"GT-N7100", SDK_VERSION_KITKAT},
+                 {"A6600", SDK_VERSION_KITKAT},
+                 {"A6800", SDK_VERSION_KITKAT},
+                 {"GT-S7262", SDK_VERSION_KITKAT},
+                 {"GT-S5282", SDK_VERSION_KITKAT},
+                 {"GT-I8552", SDK_VERSION_KITKAT},
+
+                 {"GT-P3113", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"GT-P5110", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"GT-P5100", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"GT-P5113", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"GT-P3110", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"GT-N5110", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"e-tab4", SDK_VERSION_JELLY_BEAN_MR2},
+                 {"GT-I8200Q", SDK_VERSION_JELLY_BEAN_MR2},
+
+                 {"always_works", 0},  // Some codec that works everywhere.

[watk, 2017/02/09 00:44:59]

Did you consider changing the blacklist implementation to do a lookup in an
array or map like this? Then we don't need much of a test.

[liberato (no reviews please), 2017/02/09 06:54:32]

yeah, after seeing the test it dimly crossed my mind that the test structure was
better than the thing it was testing :)

one one hand, i like the simplicity of the current code.  on the other, that's
also exactly why it didn't work before.

i'll give it a try and see what it ends up looking like.

+                 {nullptr, 0}};
+
+  for (int sdk = SDK_VERSION_JELLY_BEAN; sdk <= SDK_VERSION_NOUGAT; sdk++) {
+    for (int i = 0; devices[i].model; i++) {
+      bool supported =
+          MediaCodecUtil::IsMediaCodecAvailableForSdk(sdk, devices[i].model);
+
+      // Make sure that this model is supported if and only if |sdk| is
+      // newer than |last_bad_sdk|.
+      ASSERT_TRUE(supported == (sdk > devices[i].last_bad_sdk))
+          << " model: " << devices[i].model << " sdk: " << sdk;
+    }
+  }
+}
+
+}  // namespace media