Fix mime type mappings when the unified media pipeline is enabled.

media/blink/key_system_config_selector.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 "media/blink/key_system_config_selector.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 264 matching lines @@
 }
 
 KeySystemConfigSelector::~KeySystemConfigSelector() {
 }
 
 bool IsSupportedClearMediaFormat(const std::string& container_mime_type,
                                  const std::string& codecs) {
   std::vector<std::string> codec_vector;
   media::ParseCodecString(codecs, &codec_vector, false);
   media::SupportsType support_result =
-      media::IsSupportedMediaFormat(container_mime_type, codec_vector);
+      media::IsSupportedEncryptedMediaFormat(container_mime_type, codec_vector);
   switch (support_result) {
     case media::IsSupported:
       return true;
     case media::MayBeSupported:
       // If no codecs were specified, the best possible result is
       // MayBeSupported, indicating support for the container.
       return codec_vector.empty();
     case media::IsNotSupported:
       return false;
   }
@@ skipping 500 matching lines @@
 
 void KeySystemConfigSelector::OnPermissionResult(
     scoped_ptr<SelectionRequest> request,
     bool is_permission_granted) {
   request->was_permission_requested = true;
   request->is_permission_granted = is_permission_granted;
   SelectConfigInternal(std::move(request));
 }
 
 }  // namespace media