Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

chrome/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 469 matching lines @@
     "mac/relauncher.h",
     "mac/relauncher.mm",
     "mac/security_wrappers.cc",
     "mac/security_wrappers.h",
     "manifest/manifest_icon_downloader.cc",
     "manifest/manifest_icon_downloader.h",
     "manifest/manifest_icon_selector.cc",
     "manifest/manifest_icon_selector.h",
     "media/combined_desktop_media_list.cc",
     "media/combined_desktop_media_list.h",
-    "media/desktop_media_list.h",
-    "media/desktop_media_list_base.cc",
-    "media/desktop_media_list_base.h",
-    "media/desktop_media_picker.h",
-    "media/desktop_streams_registry.cc",
-    "media/desktop_streams_registry.h",
     "media/media_access_handler.h",
-    "media/media_capture_devices_dispatcher.cc",
-    "media/media_capture_devices_dispatcher.h",
     "media/media_device_id_salt.cc",
     "media/media_device_id_salt.h",
-    "media/media_permission.cc",
-    "media/media_permission.h",
-    "media/media_stream_capture_indicator.cc",
-    "media/media_stream_capture_indicator.h",
-    "media/media_stream_device_permission_context.cc",
-    "media/media_stream_device_permission_context.h",
-    "media/media_stream_device_permissions.cc",
-    "media/media_stream_device_permissions.h",
-    "media/media_stream_devices_controller.cc",
-    "media/media_stream_devices_controller.h",
     "media/media_url_constants.cc",
     "media/media_url_constants.h",
     "media/midi_permission_context.cc",
     "media/midi_permission_context.h",
-    "media/native_desktop_media_list.cc",
-    "media/native_desktop_media_list.h",
     "media/output_protection_proxy.cc",
     "media/output_protection_proxy.h",
-    "media/permission_bubble_media_access_handler.cc",
-    "media/permission_bubble_media_access_handler.h",
     "media/router/media_router_feature.cc",
     "media/router/media_router_feature.h",
-
-    # TODO(brettw) should this go with the webrtc sources?
-    "media/webrtc_log_list.cc",
-    "media/webrtc_log_list.h",
-    "media/window_icon_util.h",
+    "media/webrtc/desktop_media_list.h",
+    "media/webrtc/desktop_media_list_base.cc",
+    "media/webrtc/desktop_media_list_base.h",
+    "media/webrtc/desktop_media_picker.h",
+    "media/webrtc/desktop_streams_registry.cc",
+    "media/webrtc/desktop_streams_registry.h",
+    "media/webrtc/media_capture_devices_dispatcher.cc",
+    "media/webrtc/media_capture_devices_dispatcher.h",
+    "media/webrtc/media_permission.cc",
+    "media/webrtc/media_permission.h",
+    "media/webrtc/media_stream_capture_indicator.cc",
+    "media/webrtc/media_stream_capture_indicator.h",
+    "media/webrtc/media_stream_device_permission_context.cc",
+    "media/webrtc/media_stream_device_permission_context.h",
+    "media/webrtc/media_stream_device_permissions.cc",
+    "media/webrtc/media_stream_device_permissions.h",
+    "media/webrtc/media_stream_devices_controller.cc",
+    "media/webrtc/media_stream_devices_controller.h",
+    "media/webrtc/native_desktop_media_list.cc",
+    "media/webrtc/native_desktop_media_list.h",
+    "media/webrtc/permission_bubble_media_access_handler.cc",
+    "media/webrtc/permission_bubble_media_access_handler.h",
+    "media/webrtc/window_icon_util.h",
     "memory_details.cc",
     "memory_details.h",
     "memory_details_android.cc",
     "memory_details_linux.cc",
     "memory_details_mac.cc",
     "memory_details_win.cc",
     "metrics/chrome_browser_main_extra_parts_metrics.cc",
     "metrics/chrome_browser_main_extra_parts_metrics.h",
     "metrics/chrome_browser_main_extra_parts_metrics_mac.mm",
     "metrics/chrome_metrics_service_accessor.cc",
@@ skipping 633 matching lines @@
     "usb/usb_chooser_context_factory.cc",
     "usb/usb_chooser_context_factory.h",
     "usb/usb_tab_helper.cc",
     "usb/usb_tab_helper.h",
     "usb/web_usb_histograms.cc",
     "usb/web_usb_histograms.h",
     "usb/web_usb_permission_provider.cc",
     "usb/web_usb_permission_provider.h",
     "web_data_service_factory.cc",
     "web_data_service_factory.h",
+
+    # TODO(brettw) should this go with the webrtc sources?
+    "media/webrtc/webrtc_log_list.cc",
+    "media/webrtc/webrtc_log_list.h",
     "win/app_icon.cc",
     "win/app_icon.h",
     "win/browser_util.cc",
     "win/browser_util.h",
     "win/chrome_elf_init.cc",
     "win/chrome_elf_init.h",
     "win/chrome_select_file_dialog_factory.cc",
     "win/chrome_select_file_dialog_factory.h",
     "win/enumerate_modules_model.cc",
     "win/enumerate_modules_model.h",
@@ skipping 313 matching lines @@
     sources += [ "net/net_error_diagnostics_dialog_generic.cc" ]
   }
   if (!is_android && !is_chromeos) {
     sources += [
       "net/disk_cache_dir_policy_handler.cc",
       "net/disk_cache_dir_policy_handler.h",
     ]
   }
   if (is_mac) {
     sources += [
-      "media/window_icon_util_mac.mm",
+      "media/webrtc/window_icon_util_mac.mm",
       "password_manager/password_manager_util_mac.h",
       "password_manager/password_manager_util_mac.mm",
     ]
     deps += [
       "//chrome/app_shim",
       "//chrome/browser/apps/app_shim",
     ]
   }
   if (enable_extensions) {
     sources += [
@@ skipping 20 matching lines @@
       "guest_view/web_view/chrome_web_view_guest_delegate.cc",
       "guest_view/web_view/chrome_web_view_guest_delegate.h",
       "guest_view/web_view/chrome_web_view_permission_helper_delegate.cc",
       "guest_view/web_view/chrome_web_view_permission_helper_delegate.h",
       "guest_view/web_view/context_menu_content_type_web_view.cc",
       "guest_view/web_view/context_menu_content_type_web_view.h",
       "media/capture_access_handler_base.cc",
       "media/capture_access_handler_base.h",
       "media/cast_transport_host_filter.cc",
       "media/cast_transport_host_filter.h",
-      "media/desktop_capture_access_handler.cc",
-      "media/desktop_capture_access_handler.h",
       "media/extension_media_access_handler.cc",
       "media/extension_media_access_handler.h",
-      "media/tab_capture_access_handler.cc",
-      "media/tab_capture_access_handler.h",
+      "media/webrtc/desktop_capture_access_handler.cc",
+      "media/webrtc/desktop_capture_access_handler.h",
+      "media/webrtc/tab_capture_access_handler.cc",
+      "media/webrtc/tab_capture_access_handler.h",
       "metrics/extensions_metrics_provider.cc",
       "metrics/extensions_metrics_provider.h",
       "renderer_context_menu/context_menu_content_type_app_mode.cc",
       "renderer_context_menu/context_menu_content_type_app_mode.h",
       "renderer_context_menu/context_menu_content_type_extension_popup.cc",
       "renderer_context_menu/context_menu_content_type_extension_popup.h",
       "renderer_context_menu/context_menu_content_type_platform_app.cc",
       "renderer_context_menu/context_menu_content_type_platform_app.h",
       "renderer_host/chrome_extension_message_filter.cc",
       "renderer_host/chrome_extension_message_filter.h",
@@ skipping 541 matching lines @@
   if (is_chromeos) {
     sources += [
       "download/notification/download_item_notification.cc",
       "download/notification/download_item_notification.h",
       "download/notification/download_notification.cc",
       "download/notification/download_notification.h",
       "download/notification/download_notification_manager.cc",
       "download/notification/download_notification_manager.h",
       "media/protected_media_identifier_permission_context.cc",
       "media/protected_media_identifier_permission_context.h",
-      "media/window_icon_util_chromeos.cc",
+      "media/webrtc/window_icon_util_chromeos.cc",
       "metrics/chromeos_metrics_provider.cc",
       "metrics/chromeos_metrics_provider.h",
       "metrics/perf/cpu_identity.cc",
       "metrics/perf/cpu_identity.h",
       "metrics/perf/perf_output.cc",
       "metrics/perf/perf_output.h",
       "metrics/perf/random_selector.cc",
       "metrics/perf/random_selector.h",
       "metrics/perf/windowed_incognito_observer.cc",
       "metrics/perf/windowed_incognito_observer.h",
@@ skipping 81 matching lines @@
       "//ui/views/mus",
     ]
   }
   if (ui_compositor_image_transport) {
     deps += [ "//ui/gl" ]
   }
 
   if (use_ash) {
     # Cross-platform Ash sources.
     sources += [
-      "media/desktop_media_list_ash.cc",
-      "media/desktop_media_list_ash.h",
+      "media/webrtc/desktop_media_list_ash.cc",
+      "media/webrtc/desktop_media_list_ash.h",
       "renderer_context_menu/open_with_menu_factory_ash.cc",
       "renderer_context_menu/open_with_menu_factory_ash.h",
       "signin/signin_error_notifier_ash.cc",
       "signin/signin_error_notifier_ash.h",
       "signin/signin_error_notifier_factory_ash.cc",
       "signin/signin_error_notifier_factory_ash.h",
       "sync/sync_error_notifier_ash.cc",
       "sync/sync_error_notifier_ash.h",
       "sync/sync_error_notifier_factory_ash.cc",
       "sync/sync_error_notifier_factory_ash.h",
@@ skipping 416 matching lines @@
       "importer/profile_writer.h",
       "lifetime/browser_close_manager.cc",
       "lifetime/browser_close_manager.h",
       "lifetime/keep_alive_registry.cc",
       "lifetime/keep_alive_registry.h",
       "lifetime/keep_alive_state_observer.h",
       "lifetime/keep_alive_types.cc",
       "lifetime/keep_alive_types.h",
       "lifetime/scoped_keep_alive.cc",
       "lifetime/scoped_keep_alive.h",
-      "media/tab_desktop_media_list.cc",
-      "media/tab_desktop_media_list.h",
+      "media/webrtc/tab_desktop_media_list.cc",
+      "media/webrtc/tab_desktop_media_list.h",
       "media_galleries/fileapi/av_scanning_file_validator.cc",
       "media_galleries/fileapi/av_scanning_file_validator.h",
       "media_galleries/fileapi/device_media_async_file_util.cc",
       "media_galleries/fileapi/device_media_async_file_util.h",
       "media_galleries/fileapi/iapps_finder.h",
       "media_galleries/fileapi/iapps_finder_impl.cc",
       "media_galleries/fileapi/iapps_finder_impl.h",
       "media_galleries/fileapi/iapps_finder_impl_mac.mm",
       "media_galleries/fileapi/iapps_finder_impl_win.cc",
       "media_galleries/fileapi/media_file_system_backend.cc",
@@ skipping 573 matching lines @@
       "media/android/remote/record_cast_action.cc",
       "media/android/remote/record_cast_action.h",
       "media/android/remote/remote_media_player_bridge.cc",
       "media/android/remote/remote_media_player_bridge.h",
       "media/android/remote/remote_media_player_manager.cc",
       "media/android/remote/remote_media_player_manager.h",
       "media/android/router/media_router_android.cc",
       "media/android/router/media_router_android.h",
       "media/android/router/media_router_dialog_controller_android.cc",
       "media/android/router/media_router_dialog_controller_android.h",
-      "media/media_stream_infobar_delegate_android.cc",
-      "media/media_stream_infobar_delegate_android.h",
       "media/midi_permission_infobar_delegate_android.cc",
       "media/midi_permission_infobar_delegate_android.h",
       "media/protected_media_identifier_infobar_delegate_android.cc",
       "media/protected_media_identifier_infobar_delegate_android.h",
+      "media/webrtc/media_stream_infobar_delegate_android.cc",
+      "media/webrtc/media_stream_infobar_delegate_android.h",
       "metrics/android_metrics_provider.cc",
       "metrics/android_metrics_provider.h",
       "metrics/page_load_metrics_provider.cc",
       "metrics/page_load_metrics_provider.h",
       "net/spdyproxy/data_reduction_promo_infobar_delegate_android.cc",
       "net/spdyproxy/data_reduction_promo_infobar_delegate_android.h",
       "net/spdyproxy/data_reduction_proxy_settings_android.cc",
       "net/spdyproxy/data_reduction_proxy_settings_android.h",
       "page_load_metrics/observers/android_page_load_metrics_observer.cc",
       "page_load_metrics/observers/android_page_load_metrics_observer.h",
@@ skipping 96 matching lines @@
     sources += [
       "downgrade/user_data_downgrade.cc",
       "downgrade/user_data_downgrade.h",
       "first_run/try_chrome_dialog_view.cc",
       "first_run/try_chrome_dialog_view.h",
       "first_run/upgrade_util.cc",
       "google/did_run_updater_win.cc",
       "google/did_run_updater_win.h",
       "hang_monitor/hang_crash_dump_win.cc",
       "hang_monitor/hang_crash_dump_win.h",
-      "media/window_icon_util_win.cc",
+      "media/webrtc/window_icon_util_win.cc",
       "metrics/antivirus_metrics_provider_win.cc",
       "metrics/antivirus_metrics_provider_win.h",
       "password_manager/password_manager_util_win.cc",
       "password_manager/password_manager_util_win.h",
       "themes/theme_service_win.cc",
       "themes/theme_service_win.h",
     ]
     public_deps += [
       "//ui/views",
       "//ui/views/controls/webview",
@@ skipping 61 matching lines @@
   }
 
   if (is_desktop_linux) {
     # Desktop linux, doesn"t count ChromeOS.
     sources += [
       "first_run/upgrade_util.cc",
       "first_run/upgrade_util_linux.cc",
       "first_run/upgrade_util_linux.h",
       "fullscreen_aurax11.cc",
       "icon_loader_auralinux.cc",
-      "media/window_icon_util_x11.cc",
+      "media/webrtc/window_icon_util_x11.cc",
       "password_manager/native_backend_kwallet_x.cc",
       "password_manager/native_backend_kwallet_x.h",
       "platform_util_linux.cc",
       "shell_integration_linux.cc",
       "shell_integration_linux.h",
       "speech/tts_linux.cc",
       "themes/theme_service_aurax11.cc",
       "themes/theme_service_aurax11.h",
       "web_applications/web_app_linux.cc",
     ]
@@ skipping 102 matching lines @@
     ]
   }
   if (enable_supervised_users && enable_themes) {
     sources += [
       "supervised_user/supervised_user_theme.cc",
       "supervised_user/supervised_user_theme.h",
     ]
   }
   if (enable_webrtc) {
     sources += [
+      "media/audio_debug_recordings_handler.h",
+
       # TODO(brettw) should webrtc_log_list.cc go here?
-      "media/audio_debug_recordings_handler.cc",
-      "media/audio_debug_recordings_handler.h",
-      "media/webrtc_event_log_handler.cc",
-      "media/webrtc_event_log_handler.h",
-      "media/webrtc_log_uploader.cc",
-      "media/webrtc_log_uploader.h",
-      "media/webrtc_log_util.cc",
-      "media/webrtc_log_util.h",
-      "media/webrtc_logging_handler_host.cc",
-      "media/webrtc_logging_handler_host.h",
-      "media/webrtc_rtp_dump_handler.cc",
-      "media/webrtc_rtp_dump_handler.h",
-      "media/webrtc_rtp_dump_writer.cc",
-      "media/webrtc_rtp_dump_writer.h",
+      "media/webrtc/audio_debug_recordings_handler.cc",
+      "media/webrtc/webrtc_event_log_handler.cc",
+      "media/webrtc/webrtc_event_log_handler.h",
+      "media/webrtc/webrtc_log_uploader.cc",
+      "media/webrtc/webrtc_log_uploader.h",
+      "media/webrtc/webrtc_log_util.cc",
+      "media/webrtc/webrtc_log_util.h",
+      "media/webrtc/webrtc_logging_handler_host.cc",
+      "media/webrtc/webrtc_logging_handler_host.h",
+      "media/webrtc/webrtc_rtp_dump_handler.cc",
+      "media/webrtc/webrtc_rtp_dump_handler.h",
+      "media/webrtc/webrtc_rtp_dump_writer.cc",
+      "media/webrtc/webrtc_rtp_dump_writer.h",
     ]
   }
   if (enable_service_discovery) {
     sources += [
       "local_discovery/endpoint_resolver.cc",
       "local_discovery/endpoint_resolver.h",
       "local_discovery/service_discovery_client.cc",
       "local_discovery/service_discovery_client.h",
       "local_discovery/service_discovery_client_mac.h",
       "local_discovery/service_discovery_client_mac.mm",
@@ skipping 380 matching lines @@
     "browsing_data/mock_browsing_data_indexed_db_helper.cc",
     "browsing_data/mock_browsing_data_indexed_db_helper.h",
     "browsing_data/mock_browsing_data_local_storage_helper.cc",
     "browsing_data/mock_browsing_data_local_storage_helper.h",
     "browsing_data/mock_browsing_data_quota_helper.cc",
     "browsing_data/mock_browsing_data_quota_helper.h",
     "browsing_data/mock_browsing_data_service_worker_helper.cc",
     "browsing_data/mock_browsing_data_service_worker_helper.h",
     "download/download_test_file_activity_observer.cc",
     "download/download_test_file_activity_observer.h",
-    "media/fake_desktop_media_list.cc",
-    "media/fake_desktop_media_list.h",
+    "media/webrtc/fake_desktop_media_list.cc",
+    "media/webrtc/fake_desktop_media_list.h",
     "net/dns_probe_test_util.cc",
     "net/dns_probe_test_util.h",
     "net/url_request_mock_util.cc",
     "net/url_request_mock_util.h",
     "notifications/notification_test_util.cc",
     "notifications/notification_test_util.h",
     "notifications/stub_notification_platform_bridge.cc",
     "notifications/stub_notification_platform_bridge.h",
     "search_engines/template_url_service_factory_test_util.cc",
     "search_engines/template_url_service_factory_test_util.h",
@@ skipping 241 matching lines @@
   # linking all of the test support.
   static_library("pepper_cdm_test_constants") {
     testonly = true
     visibility = [ "//chrome/*" ]
     sources = [
       "media/pepper_cdm_test_constants.cc",
       "media/pepper_cdm_test_constants.h",
     ]
   }
 }