Remove redundant enum defined in both mojom and .h: MediaStreamType
This CL is the 2 out of N CL that remove redundant enums from Blink's
public API, on the mediastream directories. At this time MediaStreamType [1]
is replaced by it mojom existing variant in [2].
[1] third_party/blink/public/common/mediastream/media_stream_request.h
[2] third_party/blink/public/mojom/mediastream/media_stream.mojom
The associated typemap [3] and traits declarations [4][5] are also removed.
[3] third_party/blink/public/common/mediastream/media_stream.typemap
[4] third_party/blink/common/mediastream/media_stream_mojom_traits.cc
[5] third_party/blink/public/common/mediastream/media_stream_mojom_traits.h
[email protected]
BUG=923394,919392
Change-Id: Ie9fce964db55731892662627c1018a00b083740e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642807
Reviewed-by: Antonio Gomes <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Guido Urdaneta <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Commit-Queue: Antonio Gomes <[email protected]>
Cr-Commit-Position: refs/heads/master@{#666374}
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 39fa2274..cd9d3a6 100644
--- a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
+++ b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
@@ -126,7 +126,7 @@
extensions::Extension::GetBaseURLFromExtensionId(extension_id));
return content::GetMediaDeviceIDForHMAC(
- blink::MEDIA_DEVICE_VIDEO_CAPTURE,
+ blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE,
browser_context_->GetMediaDeviceIDSalt(), security_origin, webcam_id,
device_id);
}
diff --git a/extensions/browser/app_window/app_delegate.h b/extensions/browser/app_window/app_delegate.h
index c4870d6..1218ec59 100644
--- a/extensions/browser/app_window/app_delegate.h
+++ b/extensions/browser/app_window/app_delegate.h
@@ -82,7 +82,7 @@
virtual bool CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type,
+ blink::mojom::MediaStreamType type,
const Extension* extension) = 0;
virtual int PreferredIconSize() const = 0;
diff --git a/extensions/browser/app_window/app_web_contents_helper.cc b/extensions/browser/app_window/app_web_contents_helper.cc
index 13a7259e..0496598 100644
--- a/extensions/browser/app_window/app_web_contents_helper.cc
+++ b/extensions/browser/app_window/app_web_contents_helper.cc
@@ -107,7 +107,7 @@
bool AppWebContentsHelper::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) const {
+ blink::mojom::MediaStreamType type) const {
const Extension* extension = GetExtension();
if (!extension)
return false;
diff --git a/extensions/browser/app_window/app_web_contents_helper.h b/extensions/browser/app_window/app_web_contents_helper.h
index ea628cb..9321cdd 100644
--- a/extensions/browser/app_window/app_web_contents_helper.h
+++ b/extensions/browser/app_window/app_web_contents_helper.h
@@ -54,7 +54,7 @@
// WebContentsDelegate.
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) const;
+ blink::mojom::MediaStreamType type) const;
private:
const Extension* GetExtension() const;
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 3804502b..f104301 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -355,7 +355,7 @@
bool AppWindow::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) {
+ blink::mojom::MediaStreamType type) {
DCHECK_EQ(web_contents(),
content::WebContents::FromRenderFrameHost(render_frame_host)
->GetOutermostWebContents());
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index bd6c41e..1ace1a10 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -421,7 +421,7 @@
content::MediaResponseCallback callback) override;
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) override;
+ blink::mojom::MediaStreamType type) override;
content::WebContents* OpenURLFromTab(
content::WebContents* source,
const content::OpenURLParams& params) override;
diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
index 8cc9503..b126f42 100644
--- a/extensions/browser/extension_host.cc
+++ b/extensions/browser/extension_host.cc
@@ -453,7 +453,7 @@
bool ExtensionHost::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) {
+ blink::mojom::MediaStreamType type) {
return delegate_->CheckMediaAccessPermission(
render_frame_host, security_origin, type, extension());
}
diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
index 4027505..f4bbe0b1 100644
--- a/extensions/browser/extension_host.h
+++ b/extensions/browser/extension_host.h
@@ -126,7 +126,7 @@
content::MediaResponseCallback callback) override;
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) override;
+ blink::mojom::MediaStreamType type) override;
bool IsNeverVisible(content::WebContents* web_contents) override;
gfx::Size EnterPictureInPicture(content::WebContents* web_contents,
const viz::SurfaceId& surface_id,
diff --git a/extensions/browser/extension_host_delegate.h b/extensions/browser/extension_host_delegate.h
index 446ba131..f075bb44 100644
--- a/extensions/browser/extension_host_delegate.h
+++ b/extensions/browser/extension_host_delegate.h
@@ -71,7 +71,7 @@
virtual bool CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type,
+ blink::mojom::MediaStreamType type,
const Extension* extension) = 0;
// Returns the ExtensionHostQueue implementation to use for creating
diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
index b075617..0421a7d8 100644
--- a/extensions/browser/guest_view/app_view/app_view_guest.cc
+++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
@@ -147,7 +147,7 @@
bool AppViewGuest::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) {
+ blink::mojom::MediaStreamType type) {
if (!app_delegate_) {
return WebContentsDelegate::CheckMediaAccessPermission(
render_frame_host, security_origin, type);
diff --git a/extensions/browser/guest_view/app_view/app_view_guest.h b/extensions/browser/guest_view/app_view/app_view_guest.h
index 0fea3d0..bf9cba8 100644
--- a/extensions/browser/guest_view/app_view/app_view_guest.h
+++ b/extensions/browser/guest_view/app_view/app_view_guest.h
@@ -68,7 +68,7 @@
content::MediaResponseCallback callback) final;
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) final;
+ blink::mojom::MediaStreamType type) final;
void CompleteCreateWebContents(const GURL& url,
const Extension* guest_extension,
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index ffa0d80..2446794a 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -1055,7 +1055,7 @@
bool WebViewGuest::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) {
+ blink::mojom::MediaStreamType type) {
return web_view_permission_helper_->CheckMediaAccessPermission(
render_frame_host, security_origin, type);
}
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index e0fbe827..4321cc0 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -235,7 +235,7 @@
const base::Callback<void(bool)>& callback) final;
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) final;
+ blink::mojom::MediaStreamType type) final;
void CanDownload(const GURL& url,
const std::string& request_method,
base::OnceCallback<void(bool)> callback) final;
diff --git a/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc b/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
index 4a0e076..ff3b40d7 100644
--- a/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
@@ -35,7 +35,7 @@
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) override {
+ blink::mojom::MediaStreamType type) override {
checked_ = true;
if (check_message_loop_runner_.get())
check_message_loop_runner_->Quit();
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
index 663a36f..ad7b547 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
+++ b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
@@ -208,7 +208,7 @@
bool WebViewPermissionHelper::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type) {
+ blink::mojom::MediaStreamType type) {
if (!web_view_guest()->attached() ||
!web_view_guest()->embedder_web_contents()->GetDelegate()) {
return false;
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.h b/extensions/browser/guest_view/web_view/web_view_permission_helper.h
index c3b9014..c0b1b49 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.h
+++ b/extensions/browser/guest_view/web_view/web_view_permission_helper.h
@@ -65,7 +65,7 @@
content::MediaResponseCallback callback);
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type);
+ blink::mojom::MediaStreamType type);
void CanDownload(const GURL& url,
const std::string& request_method,
base::OnceCallback<void(bool)> callback);
diff --git a/extensions/browser/media_capture_util.cc b/extensions/browser/media_capture_util.cc
index 4b3ad0d..98b8121 100644
--- a/extensions/browser/media_capture_util.cc
+++ b/extensions/browser/media_capture_util.cc
@@ -52,12 +52,15 @@
content::MediaResponseCallback callback,
const Extension* extension) {
// app_shell only supports audio and video capture, not tab or screen capture.
- DCHECK(request.audio_type == blink::MEDIA_DEVICE_AUDIO_CAPTURE ||
- request.video_type == blink::MEDIA_DEVICE_VIDEO_CAPTURE);
+ DCHECK(request.audio_type ==
+ blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE ||
+ request.video_type ==
+ blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE);
MediaStreamDevices devices;
- if (request.audio_type == blink::MEDIA_DEVICE_AUDIO_CAPTURE) {
+ if (request.audio_type ==
+ blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
VerifyMediaAccessPermission(request.audio_type, extension);
const MediaStreamDevice* device = GetRequestedDeviceOrDefault(
MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices(),
@@ -66,7 +69,8 @@
devices.push_back(*device);
}
- if (request.video_type == blink::MEDIA_DEVICE_VIDEO_CAPTURE) {
+ if (request.video_type ==
+ blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
VerifyMediaAccessPermission(request.video_type, extension);
const MediaStreamDevice* device = GetRequestedDeviceOrDefault(
MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices(),
@@ -84,28 +88,28 @@
std::move(ui));
}
-void VerifyMediaAccessPermission(blink::MediaStreamType type,
+void VerifyMediaAccessPermission(blink::mojom::MediaStreamType type,
const Extension* extension) {
const PermissionsData* permissions_data = extension->permissions_data();
- if (type == blink::MEDIA_DEVICE_AUDIO_CAPTURE) {
+ if (type == blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
// app_shell has no UI surface to show an error, and on an embedded device
// it's better to crash than to have a feature not work.
CHECK(permissions_data->HasAPIPermission(APIPermission::kAudioCapture))
<< "Audio capture request but no audioCapture permission in manifest.";
} else {
- DCHECK(type == blink::MEDIA_DEVICE_VIDEO_CAPTURE);
+ DCHECK(type == blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE);
CHECK(permissions_data->HasAPIPermission(APIPermission::kVideoCapture))
<< "Video capture request but no videoCapture permission in manifest.";
}
}
-bool CheckMediaAccessPermission(blink::MediaStreamType type,
+bool CheckMediaAccessPermission(blink::mojom::MediaStreamType type,
const Extension* extension) {
const PermissionsData* permissions_data = extension->permissions_data();
- if (type == blink::MEDIA_DEVICE_AUDIO_CAPTURE) {
+ if (type == blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
return permissions_data->HasAPIPermission(APIPermission::kAudioCapture);
}
- DCHECK(type == blink::MEDIA_DEVICE_VIDEO_CAPTURE);
+ DCHECK(type == blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE);
return permissions_data->HasAPIPermission(APIPermission::kVideoCapture);
}
diff --git a/extensions/browser/media_capture_util.h b/extensions/browser/media_capture_util.h
index e29223d..b152fea 100644
--- a/extensions/browser/media_capture_util.h
+++ b/extensions/browser/media_capture_util.h
@@ -30,11 +30,11 @@
const Extension* extension);
// Verifies that the extension has permission for |type|. If not, crash.
-void VerifyMediaAccessPermission(blink::MediaStreamType type,
+void VerifyMediaAccessPermission(blink::mojom::MediaStreamType type,
const Extension* extension);
// Check if the extension has permission for |type|.
-bool CheckMediaAccessPermission(blink::MediaStreamType type,
+bool CheckMediaAccessPermission(blink::mojom::MediaStreamType type,
const Extension* extension);
} // namespace media_capture_util
diff --git a/extensions/shell/browser/shell_app_delegate.cc b/extensions/shell/browser/shell_app_delegate.cc
index c21e677..e4f1f252 100644
--- a/extensions/shell/browser/shell_app_delegate.cc
+++ b/extensions/shell/browser/shell_app_delegate.cc
@@ -78,7 +78,7 @@
bool ShellAppDelegate::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type,
+ blink::mojom::MediaStreamType type,
const Extension* extension) {
media_capture_util::VerifyMediaAccessPermission(type, extension);
return true;
diff --git a/extensions/shell/browser/shell_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h
index 8f42250..5cf5d83 100644
--- a/extensions/shell/browser/shell_app_delegate.h
+++ b/extensions/shell/browser/shell_app_delegate.h
@@ -43,7 +43,7 @@
const Extension* extension) override;
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type,
+ blink::mojom::MediaStreamType type,
const Extension* extension) override;
int PreferredIconSize() const override;
void SetWebContentsBlocked(content::WebContents* web_contents,
diff --git a/extensions/shell/browser/shell_extension_host_delegate.cc b/extensions/shell/browser/shell_extension_host_delegate.cc
index 0da639b..4818ae4 100644
--- a/extensions/shell/browser/shell_extension_host_delegate.cc
+++ b/extensions/shell/browser/shell_extension_host_delegate.cc
@@ -58,7 +58,7 @@
bool ShellExtensionHostDelegate::CheckMediaAccessPermission(
content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type,
+ blink::mojom::MediaStreamType type,
const Extension* extension) {
media_capture_util::VerifyMediaAccessPermission(type, extension);
return true;
diff --git a/extensions/shell/browser/shell_extension_host_delegate.h b/extensions/shell/browser/shell_extension_host_delegate.h
index 34dde0e5..f8fb8f4 100644
--- a/extensions/shell/browser/shell_extension_host_delegate.h
+++ b/extensions/shell/browser/shell_extension_host_delegate.h
@@ -31,7 +31,7 @@
const Extension* extension) override;
bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host,
const GURL& security_origin,
- blink::MediaStreamType type,
+ blink::mojom::MediaStreamType type,
const Extension* extension) override;
ExtensionHostQueue* GetExtensionHostQueue() const override;
gfx::Size EnterPictureInPicture(content::WebContents* web_contents,
