Add CombinedDesktopMediaList class

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 114 matching lines @@
       'browser/install_verification/win/module_list_unittest.cc',
       'browser/install_verification/win/module_verification_test.cc',
       'browser/install_verification/win/module_verification_test.h',
       'browser/interests/interests_fetcher_unittest.cc',
       'browser/internal_auth_unittest.cc',
       'browser/io_thread_unittest.cc',
       'browser/logging_chrome_unittest.cc',
       'browser/mac/keystone_glue_unittest.mm',
       'browser/manifest/manifest_icon_downloader_unittest.cc',
       'browser/manifest/manifest_icon_selector_unittest.cc',
+      'browser/media/combined_desktop_media_list_unittest.cc',
       'browser/media/media_stream_device_permission_context_unittest.cc',
       'browser/media/midi_permission_context_unittest.cc',
+      'browser/media/native_desktop_media_list_unittest.cc',
       'browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc',
       'browser/metrics/chrome_metrics_service_accessor_unittest.cc',
       'browser/metrics/perf/perf_provider_chromeos_unittest.cc',
       'browser/metrics/thread_watcher_android_unittest.cc',
       'browser/metrics/thread_watcher_unittest.cc',
       'browser/metrics/time_ticks_experiment_unittest.cc',
       'browser/mod_pagespeed/mod_pagespeed_metrics_unittest.cc',
       'browser/net/chrome_network_delegate_unittest.cc',
       'browser/net/dns_probe_runner_unittest.cc',
       'browser/net/dns_probe_service_unittest.cc',
@@ skipping 1328 matching lines @@
       'browser/browser_commands_unittest.cc',
       'browser/chrome_webusb_browser_client_unittest.cc',
       'browser/diagnostics/diagnostics_controller_unittest.cc',
       'browser/diagnostics/diagnostics_model_unittest.cc',
       'browser/download/download_commands_unittest.cc',
       'browser/download/download_shelf_unittest.cc',
       'browser/first_run/first_run_unittest.cc',
       'browser/font_family_cache_unittest.cc',
       'browser/importer/firefox_profile_lock_unittest.cc',
       'browser/importer/profile_writer_unittest.cc',
-      'browser/media/native_desktop_media_list_unittest.cc',
       'browser/media_galleries/fileapi/native_media_file_util_unittest.cc',
       'browser/media_galleries/gallery_watch_manager_unittest.cc',
       'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc',
       'browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm',
       'browser/media_galleries/media_file_system_registry_unittest.cc',
       'browser/media_galleries/media_folder_finder_unittest.cc',
       'browser/media_galleries/media_galleries_dialog_controller_mock.cc',
       'browser/media_galleries/media_galleries_dialog_controller_mock.h',
       'browser/media_galleries/media_galleries_dialog_controller_test_util.cc',
       'browser/media_galleries/media_galleries_dialog_controller_test_util.h',
@@ skipping 1560 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }