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

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

 // Copyright 2016 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.
 
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 #include <vector>
@@ skipping 142 matching lines @@
   chooser_controller_->OptionRemoved(base::ASCIIToUTF16("a"));
   // There is no option shown now. But since "No devices found."
   // needs to be displayed on the |table_view_|, the number of rows is 1.
   EXPECT_EQ(1, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   // |table_view_| should be disabled since all options are removed.
   ASSERT_FALSE(table_view_.enabled);
   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();
 
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
   EXPECT_EQ(1, table_view_.numberOfRows);
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
   EXPECT_EQ(2, table_view_.numberOfRows);
   chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   EXPECT_EQ(1, table_view_.numberOfRows);
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
   EXPECT_EQ(2, table_view_.numberOfRows);
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("d"));
   EXPECT_EQ(3, table_view_.numberOfRows);
   chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
   EXPECT_EQ(2, table_view_.numberOfRows);
   chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
   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();
 
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
 
   // Select option 0.
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
@@ skipping 90 matching lines @@
   // Remove option 1
   chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   EXPECT_EQ(2, table_view_.numberOfRows);
   // No option selected.
   EXPECT_EQ(-1, table_view_.selectedRow);
   // Since no option selected, the "Connect" button should be disabled.
   ASSERT_FALSE(connect_button_.enabled);
 }
 
 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();
 
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
 
   // Select option 0.
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
   EXPECT_EQ(1, table_view_.numberOfRows);
   EXPECT_EQ(0, table_view_.selectedRow);
@@ skipping 226 matching lines @@
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
 
   // Select option 0 and press "Get help" button.
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
   EXPECT_CALL(*chooser_controller_, Select(testing::_)).Times(0);
   EXPECT_CALL(*chooser_controller_, Cancel()).Times(0);
   EXPECT_CALL(*chooser_controller_, OpenHelpCenterUrl()).Times(1);
   [help_button_ performClick:chooser_dialog_controller_];
 }