EME: Remove the concept of a parent key system.

chrome/browser/media/encrypted_media_browsertest.cc

 // Copyright 2013 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 <utility>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 87 matching lines @@
 static bool IsMSESupported() {
 #if defined(OS_ANDROID)
   if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) {
     DVLOG(0) << "MSE is only supported in Android 4.1 and later.";
     return false;
   }
 #endif  // defined(OS_ANDROID)
   return true;
 }
 
-static bool IsParentKeySystemOf(const std::string& parent_key_system,
-                                const std::string& key_system) {
-  std::string prefix = parent_key_system + '.';
-  return key_system.substr(0, prefix.size()) == prefix;
-}
-
 // Base class for encrypted media tests.
 class EncryptedMediaTestBase : public MediaBrowserTest {
  public:
   EncryptedMediaTestBase() : is_pepper_cdm_registered_(false) {}
 
   bool IsExternalClearKey(const std::string& key_system) {
-    return key_system == kExternalClearKeyKeySystem ||
-           IsParentKeySystemOf(kExternalClearKeyKeySystem, key_system);
+    if (key_system == kExternalClearKeyKeySystem)
+      return true;
+    std::string prefix = std::string(kExternalClearKeyKeySystem) + '.';
+    return key_system.substr(0, prefix.size()) == prefix;
   }
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   bool IsWidevine(const std::string& key_system) {
     return key_system == kWidevineKeySystem;
   }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
   void RunEncryptedMediaTestPage(
       const std::string& html_page,
@@ skipping 540 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
   TestPlaybackCase(kLoadableSession, kEnded);
 }
 
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
   TestPlaybackCase(kUnknownSession, kEmeSessionNotFound);
 }
 
 #endif  // defined(ENABLE_PEPPER_CDMS)