diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/content/browser/media/cdm/browser_cdm_manager.h | |
parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/content/browser/media/cdm/browser_cdm_manager.h')
-rw-r--r-- | chromium/content/browser/media/cdm/browser_cdm_manager.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/chromium/content/browser/media/cdm/browser_cdm_manager.h b/chromium/content/browser/media/cdm/browser_cdm_manager.h index e3a986a6f7f..cdf088f3cb8 100644 --- a/chromium/content/browser/media/cdm/browser_cdm_manager.h +++ b/chromium/content/browser/media/cdm/browser_cdm_manager.h @@ -8,22 +8,22 @@ #include <stdint.h> #include <map> +#include <memory> #include <string> #include <vector> #include "base/callback.h" #include "base/macros.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/common/media/cdm_messages.h" #include "content/common/media/cdm_messages_enums.h" #include "content/public/browser/browser_message_filter.h" -#include "content/public/common/permission_status.mojom.h" #include "ipc/ipc_message.h" #include "media/base/cdm_promise.h" #include "media/base/eme_constants.h" #include "media/base/media_keys.h" +#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h" #include "url/gurl.h" struct CdmHostMsg_CreateSessionAndGenerateRequest_Params; @@ -151,7 +151,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter { void OnCdmCreated(int render_frame_id, int cdm_id, const GURL& security_origin, - scoped_ptr<media::SimpleCdmPromise> promise, + std::unique_ptr<media::SimpleCdmPromise> promise, const scoped_refptr<media::MediaKeys>& cdm, const std::string& error_message); @@ -184,17 +184,18 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter { media::MediaKeys::SessionType session_type, media::EmeInitDataType init_data_type, const std::vector<uint8_t>& init_data, - scoped_ptr<media::NewSessionCdmPromise> promise, + std::unique_ptr<media::NewSessionCdmPromise> promise, bool permission_was_allowed); // Calls LoadSession() on the CDM if |permission_was_allowed| is true. // Otherwise rejects |promise|. - void LoadSessionIfPermitted(int render_frame_id, - int cdm_id, - media::MediaKeys::SessionType session_type, - const std::string& session_id, - scoped_ptr<media::NewSessionCdmPromise> promise, - bool permission_was_allowed); + void LoadSessionIfPermitted( + int render_frame_id, + int cdm_id, + media::MediaKeys::SessionType session_type, + const std::string& session_id, + std::unique_ptr<media::NewSessionCdmPromise> promise, + bool permission_was_allowed); const int render_process_id_; @@ -202,7 +203,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter { // dispatched to the browser UI thread. scoped_refptr<base::TaskRunner> task_runner_; - scoped_ptr<media::CdmFactory> cdm_factory_; + std::unique_ptr<media::CdmFactory> cdm_factory_; // The key in the following maps is a combination of |render_frame_id| and // |cdm_id|. |