Update device name in chooser when device changes name (desktops)

chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

Index: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
index dd3c442e8ac14ddda0545fc2fec6979c377e4ddd..b83e3aa47f892c9a82f55a77e5572af2d94ae11c 100644
--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm
@@ -160,6 +160,24 @@ TEST_F(ChooserDialogCocoaControllerTest, RemoveOption) {
   EXPECT_EQ(-1, table_view_.selectedRow);
 }
 
+TEST_F(ChooserDialogCocoaControllerTest, UpdateOption) {
+  CreateChooserDialog();
+
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+
+  chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
+                                     base::ASCIIToUTF16("d"));
+
+  EXPECT_EQ(3, table_view_.numberOfRows);
+  EXPECT_EQ(1, table_view_.numberOfColumns);
+  ASSERT_TRUE(table_view_.enabled);
+  EXPECT_EQ(-1, table_view_.selectedRow);
+
+  EXPECT_EQ(base::ASCIIToUTF16("d"), chooser_controller_->GetOption(1));

[Jeffrey Yasskin, 2016/08/15 21:33:53]

For the cocoa controller test, can you check that the table_view_ is showing a
"d", instead of just that the chooser_controller_ thinks it should be showing a
"d"?

[juncai, 2016/08/15 23:53:34]

Done.

+}
+
 TEST_F(ChooserDialogCocoaControllerTest, AddAndRemoveOption) {
   CreateChooserDialog();
 
@@ -179,6 +197,27 @@ TEST_F(ChooserDialogCocoaControllerTest, AddAndRemoveOption) {
   EXPECT_EQ(1, table_view_.numberOfRows);
 }
 
+TEST_F(ChooserDialogCocoaControllerTest, UpdateAndRemoveTheUpdatedOption) {
+  CreateChooserDialog();
+
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+
+  chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
+                                     base::ASCIIToUTF16("d"));
+
+  chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
+
+  EXPECT_EQ(2, table_view_.numberOfRows);
+  EXPECT_EQ(1, table_view_.numberOfColumns);
+  ASSERT_TRUE(table_view_.enabled);
+  EXPECT_EQ(-1, table_view_.selectedRow);
+
+  EXPECT_EQ(base::ASCIIToUTF16("a"), chooser_controller_->GetOption(0));
+  EXPECT_EQ(base::ASCIIToUTF16("c"), chooser_controller_->GetOption(1));
+}
+
 TEST_F(ChooserDialogCocoaControllerTest, SelectAndDeselectAnOption) {
   CreateChooserDialog();
 
@@ -289,6 +328,28 @@ TEST_F(ChooserDialogCocoaControllerTest,
 }
 
 TEST_F(ChooserDialogCocoaControllerTest,
+       SelectAnOptionAndUpdateTheSelectedOption) {
+  CreateChooserDialog();
+
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+  chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+
+  // Select option 1.
+  [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1]
+           byExtendingSelection:NO];
+
+  // Update option 1.
+  chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
+                                     base::ASCIIToUTF16("d"));
+
+  EXPECT_EQ(1, table_view_.selectedRow);
+  ASSERT_TRUE(connect_button_.enabled);
+
+  EXPECT_EQ(base::ASCIIToUTF16("d"), chooser_controller_->GetOption(1));
+}
+
+TEST_F(ChooserDialogCocoaControllerTest,
        AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
   CreateChooserDialog();