Revert "Desktop Capture Picker New UI: Non Mac Structure Change"

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 1336 matching lines @@
       # Views implies app list is enabled (only disabled on mobile).
       'browser/ui/views/app_list/win/app_list_win_unittest.cc',
       'browser/ui/views/apps/shaped_app_window_targeter_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
       'browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc',
       'browser/ui/views/confirm_bubble_views_unittest.cc',
       'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
-      'browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc',
-      'browser/ui/views/desktop_media_picker_views_deprecated_unittest.cc',
+      'browser/ui/views/desktop_media_picker_views_unittest.cc',
       'browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc',
       'browser/ui/views/first_run_bubble_unittest.cc',
       'browser/ui/views/frame/browser_view_layout_unittest.cc',
       'browser/ui/views/frame/browser_view_unittest.cc',
       'browser/ui/views/frame/test_with_browser_view.cc',
       'browser/ui/views/frame/test_with_browser_view.h',
       'browser/ui/views/frame/web_contents_close_handler_unittest.cc',
       'browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc',
       'browser/ui/views/omnibox/omnibox_view_views_unittest.cc',
       'browser/ui/views/status_icons/status_tray_win_unittest.cc',
@@ skipping 1622 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }