Reland of "Convert Widevine and Android platform key systems to KeySystemProperties" with fix

android_webview/renderer/aw_content_renderer_client.cc

 // Copyright 2012 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 "android_webview/renderer/aw_content_renderer_client.h"
 
 #include <vector>
 
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
@@ skipping 200 matching lines @@
 unsigned long long AwContentRendererClient::VisitedLinkHash(
     const char* canonical_url,
     size_t length) {
   return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);
 }
 
 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
   return visited_link_slave_->IsVisited(link_hash);
 }
 
-void AwContentRendererClient::AddKeySystems(
-    std::vector<media::KeySystemInfo>* key_systems) {
+void AwContentRendererClient::AddSupportedKeySystems(
+    std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
   AwAddKeySystems(key_systems);
 }
 
 bool AwContentRendererClient::ShouldUseMediaPlayerForURL(const GURL& url) {
   // Android WebView needs to support codecs that Chrome does not, for these
   // cases we must force the usage of Android MediaPlayer instead of Chrome's
   // internal player.
   //
   // Note: Despite these extensions being forwarded for playback to MediaPlayer,
   // HTMLMediaElement.canPlayType() will return empty for these containers.
   // TODO(boliu): If this is important, extend media::MimeUtil for WebView.
   //
   // Format list mirrors:
   // http://developer.android.com/guide/appendix/media-formats.html
   static const char* kMediaPlayerExtensions[] = {
       ".3gp",  ".ts",    ".flac", ".mid", ".xmf",
       ".mxmf", ".rtttl", ".rtx",  ".ota", ".imy"};
   for (const auto& extension : kMediaPlayerExtensions) {
     if (base::EndsWith(url.path(), extension,
                        base::CompareCase::INSENSITIVE_ASCII)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace android_webview