Mac Picker UI: Screen Auto Selection

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

Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_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_unittest.mm
index 7b268ed06764960d5ac7c9b5791e91f0d30ac835..53c0bc20bada87ee8d2ab2c605c247e51d4bfa37 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_unittest.mm
@@ -167,22 +167,21 @@ TEST_F(DesktopMediaPickerControllerTest, ShowAndDismiss) {
 TEST_F(DesktopMediaPickerControllerTest, ClickShareScreen) {
   [controller_ showWindow:nil];
   ChangeType(DesktopMediaID::TYPE_SCREEN);
+
+  EXPECT_FALSE([[controller_ shareButton] isEnabled]);
   AddScreen(0);
   screen_list_->SetSourceThumbnail(0);
+  // First screen will be automatically selected.
+  EXPECT_TRUE([[controller_ shareButton] isEnabled]);
+
   AddScreen(1);
   screen_list_->SetSourceThumbnail(1);
 
   EXPECT_EQ(2U, [[controller_ screenItems] count]);
-  EXPECT_FALSE([[controller_ shareButton] isEnabled]);
-
-  NSIndexSet* index_set = [NSIndexSet indexSetWithIndex:1];
-  [[controller_ screenBrowser] setSelectionIndexes:index_set
-                              byExtendingSelection:NO];
-  EXPECT_TRUE([[controller_ shareButton] isEnabled]);
 
   [[controller_ shareButton] performClick:nil];
   EXPECT_TRUE(WaitForCallback());
-  EXPECT_EQ(screen_list_->GetSource(1).id, source_reported_);
+  EXPECT_EQ(screen_list_->GetSource(0).id, source_reported_);
 }
 
 TEST_F(DesktopMediaPickerControllerTest, ClickShareWindow) {
@@ -407,3 +406,21 @@ TEST_F(DesktopMediaPickerControllerTest, TabBrowserFocusAlgorithm) {
   selected_index = [[browser selectedRowIndexes] firstIndex];
   EXPECT_EQ(1, [[items objectAtIndex:selected_index] sourceID].id);
 }
+
+TEST_F(DesktopMediaPickerControllerTest, SingleScreenNoLabel) {
+  [controller_ showWindow:nil];
+  ChangeType(DesktopMediaID::TYPE_SCREEN);
+
+  NSArray* items = [controller_ screenItems];
+
+  AddScreen(0);
+  screen_list_->SetSourceThumbnail(0);
+  EXPECT_EQ(1U, [items count]);
+  EXPECT_EQ(nil, [[items objectAtIndex:0] imageTitle]);
+
+  AddScreen(1);
+  screen_list_->SetSourceThumbnail(1);
+  EXPECT_EQ(2U, [items count]);
+  EXPECT_NE(nil, [[items objectAtIndex:0] imageTitle]);
+  EXPECT_NE(nil, [[items objectAtIndex:1] imageTitle]);
+}