Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: media/blink/key_system_config_selector.cc

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/key_system_config_selector.h ('k') | media/blink/key_system_config_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/key_system_config_selector.cc
diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
index 885049c83872d0e5f80ec16863f6b8a501777af0..f48f34b22ca22cf9c8c0403500b054bae971fdc0 100644
--- a/media/blink/key_system_config_selector.cc
+++ b/media/blink/key_system_config_selector.cc
@@ -725,7 +725,7 @@ void KeySystemConfigSelector::SelectConfig(
// 7.2-7.4. Implemented by OnSelectConfig().
// TODO(sandersd): This should be async, ideally not on the main thread.
- scoped_ptr<SelectionRequest> request(new SelectionRequest());
+ std::unique_ptr<SelectionRequest> request(new SelectionRequest());
request->key_system = key_system_ascii;
request->candidate_configurations = candidate_configurations;
request->security_origin = security_origin;
@@ -736,7 +736,7 @@ void KeySystemConfigSelector::SelectConfig(
}
void KeySystemConfigSelector::SelectConfigInternal(
- scoped_ptr<SelectionRequest> request) {
+ std::unique_ptr<SelectionRequest> request) {
// Continued from requestMediaKeySystemAccess(), step 7.1, from
// https://w3c.github.io/encrypted-media/#requestmediakeysystemaccess
//
@@ -802,7 +802,7 @@ void KeySystemConfigSelector::SelectConfigInternal(
}
void KeySystemConfigSelector::OnPermissionResult(
- scoped_ptr<SelectionRequest> request,
+ std::unique_ptr<SelectionRequest> request,
bool is_permission_granted) {
request->was_permission_requested = true;
request->is_permission_granted = is_permission_granted;
« no previous file with comments | « media/blink/key_system_config_selector.h ('k') | media/blink/key_system_config_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698