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

chromecast/renderer/cast_content_renderer_client.h

 // 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.
 
 #ifndef CHROMECAST_RENDERER_CAST_CONTENT_RENDERER_CLIENT_H_
 #define CHROMECAST_RENDERER_CAST_CONTENT_RENDERER_CLIENT_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 17 matching lines @@
   // Creates an implementation of CastContentRendererClient. Platform should
   // link in an implementation as needed.
   static std::unique_ptr<CastContentRendererClient> Create();
 
   ~CastContentRendererClient() override;
 
   // ContentRendererClient implementation:
   void RenderThreadStarted() override;
   void RenderViewCreated(content::RenderView* render_view) override;
   void AddKeySystems(
-      std::vector< ::media::KeySystemInfo>* key_systems) override;
+      std::vector<::media::KeySystemInfo>* key_systems_info) override;
+  void AddSupportedKeySystems(
+      std::vector<std::unique_ptr<::media::KeySystemProperties>>*
+          key_systems_properties) override;
 #if !defined(OS_ANDROID)
   std::unique_ptr<::media::RendererFactory> CreateMediaRendererFactory(
       content::RenderFrame* render_frame,
       ::media::GpuVideoAcceleratorFactories* gpu_factories,
       const scoped_refptr<::media::MediaLog>& media_log) override;
 #endif
   blink::WebPrescientNetworking* GetPrescientNetworking() override;
   void DeferMediaLoad(content::RenderFrame* render_frame,
                       bool render_frame_has_played_media_before,
                       const base::Closure& closure) override;
 
  protected:
   CastContentRendererClient();
 
  private:
   std::unique_ptr<network_hints::PrescientNetworkingDispatcher>
       prescient_networking_dispatcher_;
   std::unique_ptr<CastRenderThreadObserver> cast_observer_;
   const bool allow_hidden_media_playback_;
 
   DISALLOW_COPY_AND_ASSIGN(CastContentRendererClient);
 };
 
 }  // namespace shell
 }  // namespace chromecast
 
 #endif  // CHROMECAST_RENDERER_CAST_CONTENT_RENDERER_CLIENT_H_