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

chrome/browser/ui/views/desktop_media_picker_views.h

Index: chrome/browser/ui/views/desktop_media_picker_views.h
diff --git a/chrome/browser/ui/views/desktop_media_picker_views_deprecated.h b/chrome/browser/ui/views/desktop_media_picker_views.h
similarity index 94%
rename from chrome/browser/ui/views/desktop_media_picker_views_deprecated.h
rename to chrome/browser/ui/views/desktop_media_picker_views.h
index 1433743ec3c887497c161a85ebdf2c1728aecfba..ef6ff2693504d16f95ffb31e565f3ea7a23c83b0 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views_deprecated.h
+++ b/chrome/browser/ui/views/desktop_media_picker_views.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
-#define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
 
 #include "base/macros.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
@@ -16,10 +16,6 @@ class Label;
 class Checkbox;
 }  // namespace views
 
-// TODO(qiangchen): Remove this file after new UI is done, and remove related
-// resource strings, such as IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE.
-namespace deprecated {
-
 class DesktopMediaPickerDialogView;
 class DesktopMediaPickerViews;
 class DesktopMediaSourceView;
@@ -205,6 +201,4 @@ class DesktopMediaPickerViews : public DesktopMediaPicker {
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
 };
 
-}  // namespace deprecated
-
-#endif  // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_DEPRECATED_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_