Pass video overlay renderer preference to ProxyDecryptor.

media/cdm/proxy_decryptor.h

 // Copyright 2013 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 MEDIA_CDM_PROXY_DECRYPTOR_H_
 #define MEDIA_CDM_PROXY_DECRYPTOR_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
   // session ID rather than the internal session ID.
   typedef base::Callback<void(const std::string& session_id)> KeyAddedCB;
   typedef base::Callback<void(const std::string& session_id,
                               MediaKeys::KeyError error_code,
                               uint32 system_code)> KeyErrorCB;
   typedef base::Callback<void(const std::string& session_id,
                               const std::vector<uint8>& message,
                               const GURL& destination_url)> KeyMessageCB;
 
   ProxyDecryptor(MediaPermission* media_permission,
+                 bool use_hw_secure_codecs;

[ddorwin, 2015/05/19 20:47:38]

comma

                  const KeyAddedCB& key_added_cb,
                  const KeyErrorCB& key_error_cb,
                  const KeyMessageCB& key_message_cb);
   virtual ~ProxyDecryptor();
 
   // Creates the CDM and fires |cdm_created_cb|. This method should only be
   // called once. If CDM creation failed, all following GenerateKeyRequest,
   // AddKey and CancelKeyRequest calls will result in a KeyError.
   void CreateCdm(CdmFactory* cdm_factory,
                  const std::string& key_system,
@@ skipping 62 matching lines @@
     const EmeInitDataType init_data_type;
     const std::vector<uint8> init_data;
   };
 
   bool is_creating_cdm_;
 
   // The real MediaKeys that manages key operations for the ProxyDecryptor.
   scoped_ptr<MediaKeys> media_keys_;
 
   MediaPermission* media_permission_;
+  bool use_hw_secure_codecs_;
 
   // Callbacks for firing key events.
   KeyAddedCB key_added_cb_;
   KeyErrorCB key_error_cb_;
   KeyMessageCB key_message_cb_;
 
   std::string key_system_;
   GURL security_origin_;
 
   // Keep track of both persistent and non-persistent sessions.
   base::hash_map<std::string, bool> active_sessions_;
 
   bool is_clear_key_;
 
   ScopedVector<PendingGenerateKeyRequestData> pending_requests_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PROXY_DECRYPTOR_H_