c.padhi@: Feel free to try to remove it, but let us know your plan for the removal before you start submitting CLs.

Sorry, I didn't really understand what you meant by "your plan" in your above comment. If you could elaborate a bit more on that?

As I see, StreamDeviceInfo is referenced at quite a few places. Also, I'll be doing this along with my regular work. So, if you are expecting the timeline, then this task might take some time to complete.

I meant that if/when you choose to do it, it would be good to discuss the design/approach you are going to take before actually submitting CLs since that class is referenced in many places, as you have already noticed.
No need for timelines and no hurry.

Sure. Thanks!

At the initial look, I think the approach in this case would be to simply replace StreamDeviceInfo with MediaStreamDevice wherever applicable. Since, there's not much difference between the two structs, the replacement should be pretty straight forward.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0689c1f2a2a08982c6015f94671b3ff38485dbf7

commit 0689c1f2a2a08982c6015f94671b3ff38485dbf7
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Fri Sep 01 08:13:24 2017

Replace StreamDeviceInfo with MediaStreamDevice in AudioInputDeviceManager

This CL adds a |session_id| field to MediaStreamDevice struct and
removes StreamDeviceInfo references from AudioInputDeviceManager.
MediaStreamDevice is used instead.

This is the first in a series of CLs to remove StreamDeviceInfo.

Bug:  760493 
Change-Id: Iee03348fd0c277c82b9dad3bb41cb64e6e5cfef2
Reviewed-on: https://chromium-review.googlesource.com/643447
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#499152}
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/browser/renderer_host/media/audio_input_device_manager.cc
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/browser/renderer_host/media/audio_input_device_manager.h
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/browser/renderer_host/media/audio_input_renderer_host.cc
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/browser/renderer_host/media/audio_output_authorization_handler.cc
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/browser/renderer_host/media/media_stream_manager.cc
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/public/common/media_stream_request.cc
[modify] https://crrev.com/0689c1f2a2a08982c6015f94671b3ff38485dbf7/content/public/common/media_stream_request.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5

commit 6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Fri Sep 01 16:08:49 2017

Remove StreamDeviceInfo from VideoCaptureImplManager

This is one of the many CLs aimed at removal of StreamDeviceInfo.

Bug:  760493 
Change-Id: I0d70da9b715a266c5a1e6be599095e9774470f63
Reviewed-on: https://chromium-review.googlesource.com/647064
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#499207}
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/media/media_stream_dispatcher.cc
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/media/media_stream_dispatcher.h
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/media/media_stream_dispatcher_unittest.cc
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/media/video_capture_impl_manager.cc
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/media/video_capture_impl_manager.h
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/media/video_capture_impl_manager_unittest.cc
[modify] https://crrev.com/6dbfb734f8955e82ceeecdb06f2cfaf47e5cd6b5/content/renderer/render_view_impl.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e

commit 5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Mon Sep 04 17:43:59 2017

Remove StreamDeviceInfo from MediaStreamSource and its subclasses

This CL uses MediaStreamDevice in MediaStreamSource and its subclasses
by removing all StreamDeviceInfo references. It also temporarily adds
a constructor to StreamDeviceInfo that takes a MediaStreamDevice.

This is the second in a series of CLs to remove StreamDeviceInfo.

Bug:  760493 
Change-Id: I8718001b62882e20f68b26d4c67fd48b3f6f05ba
Reviewed-on: https://chromium-review.googlesource.com/645907
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#499523}
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/common/media/media_stream_options.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/common/media/media_stream_options.h
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/local_media_stream_audio_source.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/local_media_stream_audio_source.h
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/media_stream_constraints_util_audio_unittest.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/media_stream_source.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/media_stream_source.h
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/media_stream_video_capturer_source.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/media_stream_video_capturer_source.h
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/media_stream_video_track.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/mock_media_stream_registry.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/rtc_peer_connection_handler_unittest.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/speech_recognition_audio_sink.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/speech_recognition_audio_sink_unittest.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/user_media_client_impl.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/user_media_client_impl_unittest.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/webrtc/processed_local_audio_source.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/webrtc/processed_local_audio_source.h
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
[modify] https://crrev.com/5cd1ba20c49f6a1cbff480bf5f42065d59e2ab6e/content/renderer/media/webrtc_audio_device_impl.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d1379edee83fa2d77742fd89598d0c26cfc3bdc1

commit d1379edee83fa2d77742fd89598d0c26cfc3bdc1
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Mon Sep 04 17:52:54 2017

Remove StreamDeviceInfo from MediaStreamManager and MediaStreamRequester

This is one of the many CLs aimed at removal of StreamDeviceInfo.

It also adds a new method IsSameDevice() to MediaStreamDevice that
considers an equality check for session ID which would eventually
replace SteamDeviceInfo's and its own IsEqual() method.

Bug:  760493 
Change-Id: Ibbc4b13af52b0eeeaad40058ac753a8a28612612
Reviewed-on: https://chromium-review.googlesource.com/647407
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#499524}
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_dispatcher_host.h
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_manager.cc
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_manager.h
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_manager_unittest.cc
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/media_stream_requester.h
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/browser/renderer_host/media/video_capture_unittest.cc
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/public/common/media_stream_request.cc
[modify] https://crrev.com/d1379edee83fa2d77742fd89598d0c26cfc3bdc1/content/public/common/media_stream_request.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/025c58d7169682d24a12627b8bf0ff53015f5835

commit 025c58d7169682d24a12627b8bf0ff53015f5835
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Wed Sep 06 13:29:22 2017

Define MediaStreamDevices as a typedef instead of a class

MediaStreamDevices will be used in MediaStreamDispatcher mojom
interface after removal of StreamDeviceInfo. In the current form
i.e. as a class, MediaStreamDevices would require a separate mojom
typemapping for itself. We can avoid this typemapping by defining
MediaStreamDevices as a typedef instead of a class.

Bug:  760493 ,  742682 
Change-Id: I1053217430fa16af616b0713482ceeacf7d4b134
Reviewed-on: https://chromium-review.googlesource.com/647514
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#499950}
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/chrome/browser/media/webrtc/media_stream_devices_controller.cc
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/chromecast/browser/cast_web_view.cc
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/content/public/common/media_stream_request.cc
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/content/public/common/media_stream_request.h
[modify] https://crrev.com/025c58d7169682d24a12627b8bf0ff53015f5835/extensions/shell/browser/media_capture_util.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf

commit 4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Wed Sep 06 15:57:08 2017

Remove StreamDeviceInfo from MediaStreamDispatcher

This is one of the many CLs aimed at removal of StreamDeviceInfo.

Bug:  760493 
Change-Id: If2a7b780469849f5c08b19e683af303fd258f7f9
Reviewed-on: https://chromium-review.googlesource.com/649591
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#499976}
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/common/media/media_stream.mojom
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/common/media/media_stream.typemap
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/common/media/media_stream_param_traits.h
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/renderer/media/media_stream_dispatcher.cc
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/renderer/media/media_stream_dispatcher.h
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/renderer/media/media_stream_dispatcher_unittest.cc
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/renderer/media/mock_media_stream_dispatcher.cc
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/renderer/media/mock_media_stream_dispatcher.h
[modify] https://crrev.com/4490a7d56f6e4cf0df0ab3bc70d2e1aeb8cb79bf/content/renderer/media/user_media_client_impl.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4cf5597b255c148ccc71392944b1f97818474467

commit 4cf5597b255c148ccc71392944b1f97818474467
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Wed Sep 06 18:32:26 2017

Remove StreamDeviceInfo from MediaStreamDispatcherEventHandler and its subclasses

This is another CL in the series for removal of StreamDeviceInfo.

Bug:  760493 
Change-Id: Ic0396260b1b25d5e4b75ba77cc3b8159834ec42e
Reviewed-on: https://chromium-review.googlesource.com/650278
Reviewed-by: Bill Budge <bbudge@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#500016}
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/media_stream_dispatcher.cc
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/media_stream_dispatcher_eventhandler.h
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/media_stream_dispatcher_unittest.cc
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/mock_media_stream_dispatcher.cc
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/mock_media_stream_dispatcher.h
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/user_media_client_impl.cc
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/user_media_client_impl.h
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/media/user_media_client_impl_unittest.cc
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/pepper/pepper_media_device_manager.cc
[modify] https://crrev.com/4cf5597b255c148ccc71392944b1f97818474467/content/renderer/pepper/pepper_media_device_manager.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f

commit 2cc74297b0dbaa1fd6d279bcb72bff1812579b2f
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Wed Sep 06 20:05:25 2017

Remove StreamDeviceInfo and its remaining references

This is the final CL in the series that completely removes StreamDeviceInfo.
It has been replaced with MediaStreamDevice wherever applicable.

This CL also removes unused media/media_stream_ui_controller_unittest.cc.

Bug:  760493 
Change-Id: I4ccd53a424c79e9fc23b6dcb2114797a957311b5
Reviewed-on: https://chromium-review.googlesource.com/650074
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#500055}
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/browser/image_capture/image_capture_impl.cc
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/browser/renderer_host/media/media_stream_manager.h
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/browser/renderer_host/media/media_stream_provider.h
[delete] https://crrev.com/f936fe62eb1605ef5d951b692086f9de20f3c264/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/browser/renderer_host/media/video_capture_manager_unittest.cc
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/common/media/media_stream_options.cc
[modify] https://crrev.com/2cc74297b0dbaa1fd6d279bcb72bff1812579b2f/content/common/media/media_stream_options.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/dff81508a1dd7732d333b8bc5f5c79b0a938d3ff

commit dff81508a1dd7732d333b8bc5f5c79b0a938d3ff
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Thu Sep 07 18:49:59 2017

Remove IsEqual() method from MediaStreamDevice

IsEqual() is replaced with IsSameDevice().

Bug:  760493 
Change-Id: I1017c4b43231673925e99b6cf390e00a99292352
Reviewed-on: https://chromium-review.googlesource.com/654464
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#500346}
[modify] https://crrev.com/dff81508a1dd7732d333b8bc5f5c79b0a938d3ff/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
[modify] https://crrev.com/dff81508a1dd7732d333b8bc5f5c79b0a938d3ff/content/public/common/media_stream_request.cc
[modify] https://crrev.com/dff81508a1dd7732d333b8bc5f5c79b0a938d3ff/content/public/common/media_stream_request.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/06fba2c7e0d9f64343998fe61abc49295b2c784f

commit 06fba2c7e0d9f64343998fe61abc49295b2c784f
Author: Chandan Padhi <c.padhi@samsung.com>
Date: Fri Sep 08 08:10:57 2017

Rename media_stream_options.cc|h to media_stream_controls.cc|h

With removal of StreamDeviceInfo, inclusion of media_stream_options.h in
certain files becomes reduntant. This CL removes such inclusions as well.

Bug:  760493 
Change-Id: Icfee886ea22a885fddb199cb944c6632885154f5
Reviewed-on: https://chromium-review.googlesource.com/655017
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#500537}
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/browser/renderer_host/media/media_stream_dispatcher_host.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/browser/renderer_host/media/media_stream_manager.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/browser/renderer_host/media/media_stream_manager_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/browser/renderer_host/media/video_capture_controller_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/browser/renderer_host/media/video_capture_manager.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/common/BUILD.gn
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/common/media/media_stream.mojom
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/common/media/media_stream.typemap
[add] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/common/media/media_stream_controls.cc
[rename] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/common/media/media_stream_controls.h
[delete] https://crrev.com/fbc41e545aa579e4a1b8446bf39bbb5cbc19d571/content/common/media/media_stream_options.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/common/media/media_stream_typemap_traits.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/public/common/media_stream_request.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_audio_processor_options.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_audio_processor_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_center.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_constraints_util_audio.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_constraints_util_audio_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_constraints_util_video_content.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/media_stream_constraints_util_video_content_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/mock_mojo_media_stream_dispatcher_host.h
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/video_capture_impl_manager_unittest.cc
[modify] https://crrev.com/06fba2c7e0d9f64343998fe61abc49295b2c784f/content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc

Required changes done. Hence, closing this bug.
guidou@ thanks for reviewing all the CLs.