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

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

Issue 1553493002: Global conversion of Pass()→std::move() on OS=linux chromecast=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix fragile include order Created 5 years 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
Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index 7c49c6df62a8d1ac1e1a99635adfbc99a7c7cd13..2f997d078cab44930716cb60510a15ff8b7c50f4 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -5,8 +5,8 @@
#include "content/browser/media/cdm/browser_cdm_manager.h"
#include <stddef.h>
-
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -426,7 +426,7 @@ void BrowserCdmManager::OnSetServerCertificate(
return;
}
- cdm->SetServerCertificate(certificate, promise.Pass());
+ cdm->SetServerCertificate(certificate, std::move(promise));
}
void BrowserCdmManager::OnCreateSessionAndGenerateRequest(
@@ -540,7 +540,7 @@ void BrowserCdmManager::OnUpdateSession(int render_frame_id,
return;
}
- cdm->UpdateSession(session_id, response, promise.Pass());
+ cdm->UpdateSession(session_id, response, std::move(promise));
}
void BrowserCdmManager::OnCloseSession(int render_frame_id,
@@ -558,7 +558,7 @@ void BrowserCdmManager::OnCloseSession(int render_frame_id,
return;
}
- cdm->CloseSession(session_id, promise.Pass());
+ cdm->CloseSession(session_id, std::move(promise));
}
void BrowserCdmManager::OnRemoveSession(int render_frame_id,
@@ -576,7 +576,7 @@ void BrowserCdmManager::OnRemoveSession(int render_frame_id,
return;
}
- cdm->RemoveSession(session_id, promise.Pass());
+ cdm->RemoveSession(session_id, std::move(promise));
}
void BrowserCdmManager::OnDestroyCdm(int render_frame_id, int cdm_id) {
@@ -700,8 +700,8 @@ void BrowserCdmManager::CreateSessionAndGenerateRequestIfPermitted(
return;
}
- cdm->CreateSessionAndGenerateRequest(session_type, init_data_type,
- init_data, promise.Pass());
+ cdm->CreateSessionAndGenerateRequest(session_type, init_data_type, init_data,
+ std::move(promise));
}
void BrowserCdmManager::LoadSessionIfPermitted(
@@ -725,7 +725,7 @@ void BrowserCdmManager::LoadSessionIfPermitted(
return;
}
- cdm->LoadSession(session_type, session_id, promise.Pass());
+ cdm->LoadSession(session_type, session_id, std::move(promise));
}
} // namespace content
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/common/discardable_shared_memory_heap_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698