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

chrome/chrome_browser_ui.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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 655 matching lines @@
       'browser/ui/aura/accessibility/ax_tree_source_aura.cc',
       'browser/ui/aura/accessibility/ax_tree_source_aura.h',
       'browser/ui/aura/native_window_tracker_aura.cc',
       'browser/ui/aura/native_window_tracker_aura.h',
       'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
       'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
       'browser/ui/ime/ime_window.cc',
       'browser/ui/ime/ime_window.h',
       'browser/ui/views/crypto_module_password_dialog_view.cc',
       'browser/ui/views/crypto_module_password_dialog_view.h',
-      'browser/ui/views/desktop_capture/desktop_media_picker_views.cc',
-      'browser/ui/views/desktop_capture/desktop_media_picker_views.h',
-      'browser/ui/views/desktop_media_picker_views_deprecated.cc',
-      'browser/ui/views/desktop_media_picker_views_deprecated.h',
+      'browser/ui/views/desktop_media_picker_views.cc',
+      'browser/ui/views/desktop_media_picker_views.h',
       'browser/ui/views/ime/ime_window_frame_view.cc',
       'browser/ui/views/ime/ime_window_frame_view.h',
       'browser/ui/views/ime/ime_window_view.cc',
       'browser/ui/views/ime/ime_window_view.h',
       'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
       'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
       'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
       'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
       'browser/ui/window_sizer/window_sizer_aura.cc',
     ],
@@ skipping 2630 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }