Revert "Merge blink-specific video_capture_types typemap into the original"

This reverts commit a9816cf6.

Reason for revert: [Sheriff] suspecting this cl might cause https://ci.chromium.org/p/chromium/builders/ci/Mac10.14%20Tests/2376 to fail.

Original change's description:
> Merge blink-specific video_capture_types typemap into the original
> 
> This is inspired on [1], by kinuko@.
> 
> [1] https://crrev.com/c/2016524
> 
> BUG=704136
> R=​dcheng@chromium.org, guidou@chromium.org
> 
> Change-Id: Ib51d558858d831aa1d3ba96345d3986b5afc0c54
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2096387
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
> Cr-Commit-Position: refs/heads/master@{#749108}

TBR=dalecurtis@chromium.org,haraken@chromium.org,tsepez@chromium.org,guidou@chromium.org,tonikitoo@igalia.com

Change-Id: I565415e378bd5cecd53b24335a39a3b1bc393bd0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 704136
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095111Reviewed-by: Kamila Hasanbega <hkamila@chromium.org>
Commit-Queue: Kamila Hasanbega <hkamila@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749131}

media/capture/mojom/BUILD.gn

@@ -23,24 +23,6 @@ mojom("video_capture") {
   export_header_blink = "third_party/blink/public/platform/web_common.h"
 }
 
-component("video_capture_mojom_support") {
-  sources = [
-    "video_capture_types_mojom_traits.cc",
-    "video_capture_types_mojom_traits.h",
-  ]
-  public_deps = [
-    ":video_capture_shared_cpp_sources",
-    "//media/base/ipc",
-    "//media/capture:capture_base",
-  ]
-  deps = [
-    "//media",
-    "//media/mojo/mojom",
-    "//ui/gfx/geometry/mojom:mojom_traits",
-  ]
-  defines = [ "IS_MEDIA_CAPTURE_MOJOM_TRAITS_IMPL" ]
-}
-
 mojom("image_capture") {
   sources = [ "image_capture.mojom" ]
 

media/capture/mojom/video_capture_types.typemap

@@ -9,8 +9,24 @@ public_headers = [
   "//media/capture/video/video_capture_device_descriptor.h",
   "//media/capture/video/video_capture_device_info.h",
 ]
+
 traits_headers = [ "//media/capture/mojom/video_capture_types_mojom_traits.h" ]
-public_deps = [ "//media/capture/mojom:video_capture_mojom_support" ]
+
+sources = [
+  "//media/capture/mojom/video_capture_types_mojom_traits.cc",
+]
+
+deps = [
+  "//media",
+  "//media/capture:capture_base",
+  "//media/mojo/mojom",
+  "//ui/gfx/geometry/mojom:mojom_traits",
+]
+
+public_deps = [
+  "//media/base/ipc",
+]
+
 type_mappings = [
   "media.mojom.ResolutionChangePolicy=::media::ResolutionChangePolicy",
   "media.mojom.PowerLineFrequency=::media::PowerLineFrequency",

media/capture/mojom/video_capture_types_for_blink.typemap

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+mojom = "//media/capture/mojom/video_capture_types.mojom"
+
+public_headers = [
+  "//media/capture/video_capture_types.h",
+  "//media/capture/video/video_capture_device_descriptor.h",
+  "//media/capture/video/video_capture_device_info.h",
+]
+
+traits_headers = [ "//media/capture/mojom/video_capture_types_mojom_traits.h" ]
+
+deps = [
+  "//media",
+  "//media/capture:capture_base",
+]
+
+type_mappings = [
+  "media.mojom.ResolutionChangePolicy=::media::ResolutionChangePolicy",
+  "media.mojom.PowerLineFrequency=::media::PowerLineFrequency",
+  "media.mojom.VideoCapturePixelFormat=::media::VideoPixelFormat",
+  "media.mojom.VideoCaptureBufferType=::media::VideoCaptureBufferType",
+  "media.mojom.VideoCaptureError=::media::VideoCaptureError",
+  "media.mojom.VideoCaptureFrameDropReason=::media::VideoCaptureFrameDropReason",
+  "media.mojom.VideoCaptureFormat=::media::VideoCaptureFormat",
+  "media.mojom.VideoCaptureParams=::media::VideoCaptureParams",
+  "media.mojom.VideoCaptureDeviceDescriptor=::media::VideoCaptureDeviceDescriptor",
+  "media.mojom.VideoCaptureDeviceInfo=::media::VideoCaptureDeviceInfo",
+  "media.mojom.VideoFacingMode=::media::VideoFacingMode",
+]

media/capture/mojom/video_capture_types_mojom_traits.h

@@ -6,7 +6,7 @@
 #define MEDIA_CAPTURE_MOJOM_VIDEO_CAPTURE_TYPES_MOJOM_TRAITS_H_
 
 #include "media/base/video_facing.h"
-#include "media/capture/mojom/video_capture_types.mojom-shared.h"
+#include "media/capture/mojom/video_capture_types.mojom.h"
 #include "media/capture/video/video_capture_device_descriptor.h"
 #include "media/capture/video/video_capture_device_info.h"
 #include "media/capture/video_capture_types.h"
@@ -14,9 +14,8 @@
 namespace mojo {
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::ResolutionChangePolicy,
-               media::ResolutionChangePolicy> {
+struct EnumTraits<media::mojom::ResolutionChangePolicy,
+                  media::ResolutionChangePolicy> {
   static media::mojom::ResolutionChangePolicy ToMojom(
       media::ResolutionChangePolicy policy);
 
@@ -25,8 +24,7 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::PowerLineFrequency, media::PowerLineFrequency> {
+struct EnumTraits<media::mojom::PowerLineFrequency, media::PowerLineFrequency> {
   static media::mojom::PowerLineFrequency ToMojom(
       media::PowerLineFrequency frequency);
 
@@ -35,8 +33,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoCapturePixelFormat, media::VideoPixelFormat> {
+struct EnumTraits<media::mojom::VideoCapturePixelFormat,
+                  media::VideoPixelFormat> {
   static media::mojom::VideoCapturePixelFormat ToMojom(
       media::VideoPixelFormat input);
   static bool FromMojom(media::mojom::VideoCapturePixelFormat input,
@@ -44,9 +42,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoCaptureBufferType,
-               media::VideoCaptureBufferType> {
+struct EnumTraits<media::mojom::VideoCaptureBufferType,
+                  media::VideoCaptureBufferType> {
   static media::mojom::VideoCaptureBufferType ToMojom(
       media::VideoCaptureBufferType buffer_type);
 
@@ -55,8 +52,7 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoCaptureError, media::VideoCaptureError> {
+struct EnumTraits<media::mojom::VideoCaptureError, media::VideoCaptureError> {
   static media::mojom::VideoCaptureError ToMojom(
       media::VideoCaptureError buffer_type);
 
@@ -65,9 +61,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoCaptureFrameDropReason,
-               media::VideoCaptureFrameDropReason> {
+struct EnumTraits<media::mojom::VideoCaptureFrameDropReason,
+                  media::VideoCaptureFrameDropReason> {
   static media::mojom::VideoCaptureFrameDropReason ToMojom(
       media::VideoCaptureFrameDropReason buffer_type);
 
@@ -76,25 +71,22 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoFacingMode, media::VideoFacingMode> {
+struct EnumTraits<media::mojom::VideoFacingMode, media::VideoFacingMode> {
   static media::mojom::VideoFacingMode ToMojom(media::VideoFacingMode input);
   static bool FromMojom(media::mojom::VideoFacingMode input,
                         media::VideoFacingMode* output);
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoCaptureApi, media::VideoCaptureApi> {
+struct EnumTraits<media::mojom::VideoCaptureApi, media::VideoCaptureApi> {
   static media::mojom::VideoCaptureApi ToMojom(media::VideoCaptureApi input);
   static bool FromMojom(media::mojom::VideoCaptureApi input,
                         media::VideoCaptureApi* output);
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    EnumTraits<media::mojom::VideoCaptureTransportType,
-               media::VideoCaptureTransportType> {
+struct EnumTraits<media::mojom::VideoCaptureTransportType,
+                  media::VideoCaptureTransportType> {
   static media::mojom::VideoCaptureTransportType ToMojom(
       media::VideoCaptureTransportType input);
   static bool FromMojom(media::mojom::VideoCaptureTransportType input,
@@ -102,9 +94,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    StructTraits<media::mojom::VideoCaptureFormatDataView,
-                 media::VideoCaptureFormat> {
+struct StructTraits<media::mojom::VideoCaptureFormatDataView,
+                    media::VideoCaptureFormat> {
   static const gfx::Size& frame_size(const media::VideoCaptureFormat& format) {
     return format.frame_size;
   }
@@ -123,9 +114,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    StructTraits<media::mojom::VideoCaptureParamsDataView,
-                 media::VideoCaptureParams> {
+struct StructTraits<media::mojom::VideoCaptureParamsDataView,
+                    media::VideoCaptureParams> {
   static media::VideoCaptureFormat requested_format(
       const media::VideoCaptureParams& params) {
     return params.requested_format;
@@ -156,9 +146,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    StructTraits<media::mojom::VideoCaptureDeviceDescriptorDataView,
-                 media::VideoCaptureDeviceDescriptor> {
+struct StructTraits<media::mojom::VideoCaptureDeviceDescriptorDataView,
+                    media::VideoCaptureDeviceDescriptor> {
   static const std::string& display_name(
       const media::VideoCaptureDeviceDescriptor& input) {
     return input.display_name();
@@ -194,9 +183,8 @@ struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
 };
 
 template <>
-struct COMPONENT_EXPORT(MEDIA_CAPTURE_MOJOM_TRAITS)
-    StructTraits<media::mojom::VideoCaptureDeviceInfoDataView,
-                 media::VideoCaptureDeviceInfo> {
+struct StructTraits<media::mojom::VideoCaptureDeviceInfoDataView,
+                    media::VideoCaptureDeviceInfo> {
   static const media::VideoCaptureDeviceDescriptor& descriptor(
       const media::VideoCaptureDeviceInfo& input) {
     return input.descriptor;

third_party/blink/renderer/platform/mojo/blink_typemaps.gni

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 typemaps = [
-  "//media/capture/mojom/video_capture_types.typemap",
+  "//media/capture/mojom/video_capture_types_for_blink.typemap",
   "//media/mojo/mojom/audio_parameters.typemap",
   "//services/network/public/cpp/http_request_headers.typemap",
   "//services/network/public/cpp/ip_address.typemap",