extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc - Issue 1928493002: Use url::Origin to represent security origins in MediaStream-related code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/webcam_private/webcam_private_api_chromeos.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/renderer/pepper/pepper_media_device_manager.cc ('k') | third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc

diff --git a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc

index bfdc47ac9a425e234a04f0a3ea10ce9b413fd253..353517c063efe35bffbb71682ef5834ae72a9fdb 100644

--- a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc

+++ b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc

@@ -13,6 +13,7 @@

#include "extensions/browser/process_manager.h"

#include "extensions/browser/process_manager_factory.h"

#include "extensions/common/api/webcam_private.h"

+#include "url/origin.h"

namespace webcam_private = extensions::api::webcam_private;

@@ -113,8 +114,8 @@ void WebcamPrivateAPI::OnOpenSerialWebcam(

bool WebcamPrivateAPI::GetDeviceId(const std::string& extension_id,

const std::string& webcam_id,

std::string* device_id) {

- GURL security_origin =

- extensions::Extension::GetBaseURLFromExtensionId(extension_id);

+ url::Origin security_origin(

+ extensions::Extension::GetBaseURLFromExtensionId(extension_id));

return content::GetMediaDeviceIDForHMAC(

content::MEDIA_DEVICE_VIDEO_CAPTURE,

@@ -126,8 +127,8 @@ bool WebcamPrivateAPI::GetDeviceId(const std::string& extension_id,

std::string WebcamPrivateAPI::GetWebcamId(const std::string& extension_id,

const std::string& device_id) {

- GURL security_origin =

- extensions::Extension::GetBaseURLFromExtensionId(extension_id);

+ url::Origin security_origin(

+ extensions::Extension::GetBaseURLFromExtensionId(extension_id));

return content::GetHMACForMediaDeviceID(

browser_context_->GetResourceContext()->GetMediaDeviceIDSalt(),