Desktop Capture Picker Window New UI For Mac

chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm

Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
similarity index 86%
copy from chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
copy to chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
index 663d5d9cf1b3efea550be3bc8e51a5b11a121fcc..f96ceeb4c3a3f7b3ff741e0db03f5deccac3189c 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated_unittest.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
+#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
@@ -13,14 +13,14 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest_mac.h"
 
-@interface DesktopMediaPickerController (ExposedForTesting)
+@interface DesktopMediaPickerControllerDeprecated (ExposedForTesting)
 - (IKImageBrowserView*)sourceBrowser;
 - (NSButton*)shareButton;
 - (NSButton*)audioShareCheckbox;
 - (NSArray*)items;
 @end
 
-@implementation DesktopMediaPickerController (ExposedForTesting)
+@implementation DesktopMediaPickerControllerDeprecated (ExposedForTesting)
 - (IKImageBrowserView*)sourceBrowser {
   return sourceBrowser_;
 }
@@ -42,9 +42,9 @@
 }
 @end
 
-class DesktopMediaPickerControllerTest : public CocoaTest {
+class DesktopMediaPickerControllerDeprecatedTest : public CocoaTest {
  public:
-  DesktopMediaPickerControllerTest() {}
+  DesktopMediaPickerControllerDeprecatedTest() {}
 
   void SetUp() override {
     CocoaTest::SetUp();
@@ -54,10 +54,10 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
     tab_list_ = new FakeDesktopMediaList();
 
     DesktopMediaPicker::DoneCallback callback =
-        base::Bind(&DesktopMediaPickerControllerTest::OnResult,
+        base::Bind(&DesktopMediaPickerControllerDeprecatedTest::OnResult,
                    base::Unretained(this));
 
-    controller_.reset([[DesktopMediaPickerController alloc]
+    controller_.reset([[DesktopMediaPickerControllerDeprecated alloc]
         initWithScreenList:std::unique_ptr<DesktopMediaList>(screen_list_)
                 windowList:std::unique_ptr<DesktopMediaList>(window_list_)
                    tabList:std::unique_ptr<DesktopMediaList>(tab_list_)
@@ -93,10 +93,10 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
   FakeDesktopMediaList* screen_list_ = nullptr;
   FakeDesktopMediaList* window_list_ = nullptr;
   FakeDesktopMediaList* tab_list_ = nullptr;
-  base::scoped_nsobject<DesktopMediaPickerController> controller_;
+  base::scoped_nsobject<DesktopMediaPickerControllerDeprecated> controller_;
 };
 
-TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, ShowAndDismiss) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -111,7 +111,7 @@ TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
   EXPECT_TRUE([[items objectAtIndex:1] imageRepresentation] != nil);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, ClickShare) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, ClickShare) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -132,7 +132,7 @@ TEST_F(DesktopMediaPickerControllerTest, ClickShare) {
   EXPECT_EQ(window_list_->GetSource(1).id, source_reported_);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, ClickCancel) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, ClickCancel) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -145,7 +145,7 @@ TEST_F(DesktopMediaPickerControllerTest, ClickCancel) {
   EXPECT_EQ(content::DesktopMediaID(), source_reported_);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, CloseWindow) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, CloseWindow) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -158,7 +158,7 @@ TEST_F(DesktopMediaPickerControllerTest, CloseWindow) {
   EXPECT_EQ(content::DesktopMediaID(), source_reported_);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, UpdateThumbnail) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, UpdateThumbnail) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -174,7 +174,7 @@ TEST_F(DesktopMediaPickerControllerTest, UpdateThumbnail) {
   EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, UpdateName) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, UpdateName) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -190,7 +190,7 @@ TEST_F(DesktopMediaPickerControllerTest, UpdateName) {
   EXPECT_NE(version, [[items objectAtIndex:0] imageVersion]);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, RemoveSource) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, RemoveSource) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -203,7 +203,7 @@ TEST_F(DesktopMediaPickerControllerTest, RemoveSource) {
   EXPECT_NSEQ(@"foo", [[items objectAtIndex:1] imageTitle]);
 }
 
-TEST_F(DesktopMediaPickerControllerTest, MoveSource) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, MoveSource) {
   [controller_ showWindow:nil];
 
   window_list_->AddSource(0);
@@ -222,7 +222,7 @@ TEST_F(DesktopMediaPickerControllerTest, MoveSource) {
 // Make sure the audio share checkbox' state reacts correctly with
 // the source selection. Namely the checkbox is enabled only for tab
 // sharing on Mac.
-TEST_F(DesktopMediaPickerControllerTest, AudioShareCheckboxState) {
+TEST_F(DesktopMediaPickerControllerDeprecatedTest, AudioShareCheckboxState) {
   [controller_ showWindow:nil];
 
   screen_list_->AddSourceByFullMediaID(