Explicitly differentiate key system support functions by EME version.

media/blink/webcontentdecryptionmodule_impl.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 "webcontentdecryptionmodule_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 22 matching lines @@
   // TODO(ddorwin): Guard against this in supported types check and remove this.
   // Chromium only supports ASCII key systems.
   if (!base::IsStringASCII(key_system)) {
     NOTREACHED();
     result.completeWithError(
         blink::WebContentDecryptionModuleExceptionNotSupportedError, 0,
         "Invalid keysystem.");
     return;
   }
 
+  // TODO(ddorwin): This should be a DCHECK.
   std::string key_system_ascii = base::UTF16ToASCII(key_system);
-  if (!media::IsConcreteSupportedKeySystem(key_system_ascii)) {
+  if (!media::IsSupportedKeySystem(key_system_ascii)) {
     std::string message =
         "Keysystem '" + key_system_ascii + "' is not supported.";
     result.completeWithError(
         blink::WebContentDecryptionModuleExceptionNotSupportedError, 0,
         blink::WebString::fromUTF8(message));
     return;
   }
 
   // If unique security origin, don't try to create the CDM.
   if (security_origin.isUnique() || security_origin.toString() == "null") {
@@ skipping 44 matching lines @@
       base::saturated_cast<int>(server_certificate_length),
       scoped_ptr<SimpleCdmPromise>(
           new CdmResultPromise<>(result, std::string())));
 }
 
 CdmContext* WebContentDecryptionModuleImpl::GetCdmContext() {
   return adapter_->GetCdmContext();
 }
 
 }  // namespace media