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

Unified Diff: content/public/browser/media_device_id.cc

Issue 1928493002: Use url::Origin to represent security origins in MediaStream-related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 | « content/public/browser/media_device_id.h ('k') | content/renderer/media/media_stream_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/media_device_id.cc
diff --git a/content/public/browser/media_device_id.cc b/content/public/browser/media_device_id.cc
index 876e12acdb48f95f64df236dba7fcc9bbdad9ca8..d99d0f240c9a5ee21301299c71bd7132d22fa56f 100644
--- a/content/public/browser/media_device_id.cc
+++ b/content/public/browser/media_device_id.cc
@@ -9,14 +9,14 @@
namespace content {
std::string GetHMACForMediaDeviceID(const ResourceContext::SaltCallback& sc,
- const GURL& security_origin,
+ const url::Origin& security_origin,
const std::string& raw_unique_id) {
return MediaStreamManager::GetHMACForMediaDeviceID(sc, security_origin,
raw_unique_id);
}
bool DoesMediaDeviceIDMatchHMAC(const ResourceContext::SaltCallback& sc,
- const GURL& security_origin,
+ const url::Origin& security_origin,
const std::string& device_guid,
const std::string& raw_unique_id) {
return MediaStreamManager::DoesMediaDeviceIDMatchHMAC(
@@ -25,7 +25,7 @@ bool DoesMediaDeviceIDMatchHMAC(const ResourceContext::SaltCallback& sc,
bool GetMediaDeviceIDForHMAC(MediaStreamType stream_type,
const ResourceContext::SaltCallback& rc,
- const GURL& security_origin,
+ const url::Origin& security_origin,
const std::string& source_id,
std::string* device_id) {
content::MediaStreamManager* manager =
« no previous file with comments | « content/public/browser/media_device_id.h ('k') | content/renderer/media/media_stream_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698