Support Android secure codecs in requestMediaKeySystemAccess().

media/blink/key_system_config_selector_unittest.cc

 // Copyright 2015 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 51 matching lines @@
         return (init_data_types & kInitDataTypeMaskWebM) != 0;
       case EmeInitDataType::CENC:
         return (init_data_types & kInitDataTypeMaskCenc) != 0;
       case EmeInitDataType::KEYIDS:
         return (init_data_types & kInitDataTypeMaskKeyIds) != 0;
     }
     NOTREACHED();
     return false;
   }
 
-  bool IsSupportedCodecCombination(
+  // TODO(sandersd): Secure codec simulation.
+  EmeConfigRule GetContentTypeConfigRule(
       const std::string& key_system,
       EmeMediaType media_type,
       const std::string& container_mime_type,
       const std::vector<std::string>& codecs) const override {
     if (container_mime_type == kUnsupportedContainer)
-      return false;
+      return EmeConfigRule::NOT_SUPPORTED;
     DCHECK_EQ(kSupportedContainer, container_mime_type);
     for (const std::string& codec : codecs) {
       if (codec == kUnsupportedCodec)
-        return false;
+        return EmeConfigRule::NOT_SUPPORTED;
       DCHECK_EQ(kSupportedCodec, codec);
     }
-    return true;
+    return EmeConfigRule::SUPPORTED;
   }
 
   EmeConfigRule GetRobustnessConfigRule(
       const std::string& key_system,
       EmeMediaType media_type,
       const std::string& requested_robustness) const override {
     if (requested_robustness == kUnsupported)
       return EmeConfigRule::NOT_SUPPORTED;
     if (requested_robustness == kRequireIdentifier)
       return EmeConfigRule::IDENTIFIER_REQUIRED;
@@ skipping 660 matching lines @@
 
   blink::WebMediaKeySystemConfiguration config2;
   config2.label = "b";
   configs_.push_back(config2);
 
   ASSERT_TRUE(SelectConfigRequestsPermissionAndReturnsConfig());
   ASSERT_EQ("b", config_.label);
 }
 
 }  // namespace media