Explicitly differentiate key system support functions by EME version.

media/blink/webencryptedmediaclient_impl.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 "webencryptedmediaclient_impl.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/key_systems.h"
 #include "media/base/media_permission.h"
+#include "media/blink/webcontentdecryptionmodule_impl.h"
+#include "media/blink/webcontentdecryptionmoduleaccess_impl.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebEncryptedMediaRequest.h"
 #include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
-#include "webcontentdecryptionmodule_impl.h"
-#include "webcontentdecryptionmoduleaccess_impl.h"
 
 namespace media {
 
 // These names are used by UMA.
 const char kKeySystemSupportUMAPrefix[] =
     "Media.EME.RequestMediaKeySystemAccess.";
 
 static bool IsSupportedContentType(
     const std::string& key_system,
     const std::string& mime_type,
@@ skipping 189 matching lines @@
     request.requestNotSupported("Only ASCII keySystems are supported");
     return;
   }
 
   std::string key_system = base::UTF16ToASCII(request.keySystem());
 
   // Report this request to the appropriate Reporter.
   Reporter* reporter = GetReporter(key_system);
   reporter->ReportRequested();
 
-  if (!IsConcreteSupportedKeySystem(key_system)) {
+  if (!IsSupportedKeySystem(key_system)) {
     request.requestNotSupported("Unsupported keySystem");
     return;
   }
 
   // 7.2 Let implementation be the implementation of keySystem.
   // 7.3 For each value in supportedConfigurations, run the GetSupported
   //     Configuration algorithm and if successful, resolve promise with access
   //     and abort these steps.
   const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
       configurations = request.supportedConfigurations();
@@ skipping 44 matching lines @@
     return reporter;
 
   // Reporter not found, so create one.
   auto result =
       reporters_.add(uma_name, make_scoped_ptr(new Reporter(uma_name)));
   DCHECK(result.second);
   return result.first->second;
 }
 
 }  // namespace media