Reland r262568 "Encrypted Media: Check container mime type in MediaDrmBridge".

content/browser/media/android/browser_media_player_manager.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 "content/browser/media/android/browser_media_player_manager.h"
 
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
@@ skipping 571 matching lines @@
 void BrowserMediaPlayerManager::OnInitializeCdm(int cdm_id,
                                                 const std::string& key_system,
                                                 const GURL& security_origin) {
   if (key_system.size() > kMaxKeySystemLength) {
     // This failure will be discovered and reported by OnCreateSession()
     // as GetDrmBridge() will return null.
     NOTREACHED() << "Invalid key system: " << key_system;
     return;
   }
 
-  if (!MediaDrmBridge::IsKeySystemSupportedWithType(key_system, "")) {
+  if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
     NOTREACHED() << "Unsupported key system: " << key_system;
     return;
   }
 
   AddDrmBridge(cdm_id, key_system, security_origin);
 }
 
 void BrowserMediaPlayerManager::OnCreateSession(
     int cdm_id,
     uint32 session_id,
@@ skipping 271 matching lines @@
   if (player && player->IsSurfaceInUse())
     return;
   ExternalVideoSurfaceContainer* surface_container =
       ExternalVideoSurfaceContainer::FromWebContents(web_contents_);
   if (surface_container)
     surface_container->ReleaseExternalVideoSurface(player_id);
 #endif  // defined(VIDEO_HOLE)
 }
 
 }  // namespace content