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

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

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/common/media/media_stream_messages.h ('k') | content/public/browser/media_device_id.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/media_device_id.h
diff --git a/content/public/browser/media_device_id.h b/content/public/browser/media_device_id.h
index 3a42060f834e7afd74713170d37141fd16d89fce..579d995f5b4387384726c05eb056708497b1b510 100644
--- a/content/public/browser/media_device_id.h
+++ b/content/public/browser/media_device_id.h
@@ -15,7 +15,7 @@
#include "content/common/content_export.h"
#include "content/public/browser/resource_context.h"
#include "content/public/common/media_stream_request.h"
-#include "url/gurl.h"
+#include "url/origin.h"
namespace content {
@@ -23,21 +23,21 @@ namespace content {
// particular security origin.
CONTENT_EXPORT std::string GetHMACForMediaDeviceID(
const ResourceContext::SaltCallback& sc,
- const GURL& security_origin,
+ const url::Origin& security_origin,
const std::string& raw_unique_id);
// Convenience method to check if |device_guid| is an HMAC of
// |raw_device_id| for |security_origin|.
CONTENT_EXPORT 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);
CONTENT_EXPORT 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);
« no previous file with comments | « content/common/media/media_stream_messages.h ('k') | content/public/browser/media_device_id.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698