Fix encrypted-media-requestmediakeysystemaccess Layout Test.

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/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 118 matching lines @@
 static bool IsSupportedContentType(
     const KeySystems& key_systems,
     const std::string& key_system,
     EmeMediaType media_type,
     const std::string& container_mime_type,
     const std::string& codecs) {
   // TODO(sandersd): Move contentType parsing from Blink to here so that invalid
   // parameters can be rejected. http://crbug.com/417561
   std::string container_lower = base::StringToLowerASCII(container_mime_type);
 
-  // Check that |codecs| are supported by the CDM. This check does not handle
-  // extended codecs, so extended codec information is stripped.
+  // Check that |container_mime_type| and |codecs| are supported by the CDM.
+  // This check does not handle extended codecs, so extended codec information
+  // is stripped.
   std::vector<std::string> codec_vector;
   net::ParseCodecString(codecs, &codec_vector, true);
   if (!key_systems.IsSupportedCodecCombination(
            key_system, media_type, container_lower, codec_vector)) {
     return false;
   }
 
+  if (codec_vector.empty())
+    return true;
+
   // Check that |codecs| are supported by Chrome. This is done primarily to
   // validate extended codecs, but it also ensures that the CDM cannot support
-  // codecs that Chrome does not (which would be bad because it would require
-  // considering the accumulated configuration, and could affect whether secure
-  // decode is required).
+  // codecs that Chrome does not (which could complicate the robustness
+  // algorithm).
   codec_vector.clear();
   net::ParseCodecString(codecs, &codec_vector, false);
   return (net::IsSupportedStrictMediaMimeType(container_lower, codec_vector) ==
           net::IsSupported);
 }
 
 static bool GetSupportedCapabilities(
     const KeySystems& key_systems,
     const std::string& key_system,
     EmeMediaType media_type,
@@ skipping 526 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