MediaDrm: Only apply Widevine security levels to the Widevine key system.

media/base/android/media_drm_bridge_unittest.cc

 // Copyright 2014 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 "base/android/build_info.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 27 matching lines @@
   return MediaDrmBridge::IsKeySystemSupported(key_system);
 }
 
 static bool IsKeySystemSupportedWithType(
     const std::string& key_system,
     const std::string& container_mime_type) {
   return MediaDrmBridge::IsKeySystemSupportedWithType(key_system,
                                                       container_mime_type);
 }
 
-static bool IsSecurityLevelSupported(
-    const std::string& key_system,
-    MediaDrmBridge::SecurityLevel security_level) {
-  return MediaDrmBridge::IsSecurityLevelSupported(key_system, security_level);

[ddorwin, 2015/02/18 02:19:26]

This is the only place this function is used. Does it only exist for testing or
is it okay to remove?

[qinmin, 2015/02/18 06:45:40]

i am ok to remove these tests. The function is used to test whether the bots
support widevine or not, and nothing else.

[ddorwin, 2015/02/18 18:11:50]

They were also covering setting security levels for Widevine, so I added a test
to specifically cover that.

-}
-
-TEST(MediaDrmBridgeTest, IsSecurityLevelSupported_Widevine) {
-  EXPECT_FALSE(IsSecurityLevelSupported(kWidevineKeySystem, kLNone));
-  // We test "L3" fully. But for "L1" we don't check the result as it depends on
-  // whether the test device supports "L1".
-  EXPECT_TRUE_IF_AVAILABLE(IsSecurityLevelSupported(kWidevineKeySystem, kL3));
-  IsSecurityLevelSupported(kWidevineKeySystem, kL1);
-}
-
-// Invalid keysytem is NOT supported regardless whether MediaDrm is available.
-TEST(MediaDrmBridgeTest, IsSecurityLevelSupported_InvalidKeySystem) {
-  EXPECT_FALSE(IsSecurityLevelSupported(kInvalidKeySystem, kLNone));
-  EXPECT_FALSE(IsSecurityLevelSupported(kInvalidKeySystem, kL1));
-  EXPECT_FALSE(IsSecurityLevelSupported(kInvalidKeySystem, kL3));
-}
-
 TEST(MediaDrmBridgeTest, IsKeySystemSupported_Widevine) {
   EXPECT_TRUE_IF_AVAILABLE(IsKeySystemSupported(kWidevineKeySystem));
 
   // TODO(xhwang): Enable when b/13564917 is fixed.
   // EXPECT_TRUE_IF_AVAILABLE(
   //     IsKeySystemSupportedWithType(kWidevineKeySystem, kAudioMp4));
   EXPECT_TRUE_IF_AVAILABLE(
       IsKeySystemSupportedWithType(kWidevineKeySystem, kVideoMp4));
 
   if (base::android::BuildInfo::GetInstance()->sdk_int() <= 19) {
@@ skipping 15 matching lines @@
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, kAudioMp4));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, kVideoMp4));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, kAudioWebM));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, kVideoWebM));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, "unknown"));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, "video/avi"));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, "audio/mp3"));
 }
 
 }  // namespace media