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

chromecast/renderer/cast_content_renderer_client.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 "chromecast/renderer/cast_content_renderer_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 83 matching lines @@
     webview->setDefaultPageScaleLimits(1.f, 1.f);
     webview->setInitialPageScaleOverride(1.f);
 
     // Disable application cache as Chromecast doesn't support off-line
     // application running.
     webview->settings()->setOfflineWebApplicationCacheEnabled(false);
   }
 }
 
 void CastContentRendererClient::AddKeySystems(
-    std::vector< ::media::KeySystemInfo>* key_systems) {
-  AddChromecastKeySystems(key_systems);
+    std::vector<::media::KeySystemInfo>* key_systems_info) {
+  AddChromecastKeySystemsInfo(key_systems_info);
+}
+
+void CastContentRendererClient::AddSupportedKeySystems(
+    std::vector<std::unique_ptr<::media::KeySystemProperties>>*
+        key_systems_properties) {
+  AddChromecastKeySystems(key_systems_properties);
 }
 
 #if !defined(OS_ANDROID)
 std::unique_ptr<::media::RendererFactory>
 CastContentRendererClient::CreateMediaRendererFactory(
     ::content::RenderFrame* render_frame,
     ::media::GpuVideoAcceleratorFactories* gpu_factories,
     const scoped_refptr<::media::MediaLog>& media_log) {
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
@@ skipping 18 matching lines @@
     closure.Run();
     return;
   }
 
   // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
   new CastMediaLoadDeferrer(render_frame, closure);
 }
 
 }  // namespace shell
 }  // namespace chromecast