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

chrome/browser/ui/views/chooser_content_view_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/views/chooser_content_view.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 145 matching lines @@
   EXPECT_EQ(1, table_view_->RowCount());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT),
       table_model_->GetText(0, 0));
   // |table_view_| should be disabled since all options are removed.
   EXPECT_FALSE(table_view_->enabled());
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 }
 
+TEST_F(ChooserContentViewTest, UpdateOption) {
+  EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(0);
+
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+
+  mock_chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
+                                          base::ASCIIToUTF16("d"));
+  EXPECT_EQ(3, table_view_->RowCount());
+  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+  EXPECT_EQ(base::ASCIIToUTF16("d"), table_model_->GetText(1, 0));
+  EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(2, 0));
+  EXPECT_TRUE(table_view_->enabled());
+  EXPECT_EQ(0, table_view_->SelectedRowCount());
+  EXPECT_EQ(-1, table_view_->FirstSelectedRow());
+}
+
 TEST_F(ChooserContentViewTest, AddAndRemoveOption) {
   // Called from TableView::OnItemsRemoved().
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
 
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
   EXPECT_EQ(1, table_view_->RowCount());
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
   EXPECT_EQ(2, table_view_->RowCount());
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   EXPECT_EQ(1, table_view_->RowCount());
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
   EXPECT_EQ(2, table_view_->RowCount());
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("d"));
   EXPECT_EQ(3, table_view_->RowCount());
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
   EXPECT_EQ(2, table_view_->RowCount());
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
   EXPECT_EQ(1, table_view_->RowCount());
 }
 
+TEST_F(ChooserContentViewTest, UpdateAndRemoveTheUpdatedOption) {
+  // Called from TableView::OnItemsRemoved().
+  EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(1);
+
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+
+  mock_chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
+                                          base::ASCIIToUTF16("d"));
+  mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
+
+  EXPECT_EQ(2, table_view_->RowCount());
+  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+  EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(1, 0));
+  EXPECT_TRUE(table_view_->enabled());
+  EXPECT_EQ(0, table_view_->SelectedRowCount());
+  EXPECT_EQ(-1, table_view_->FirstSelectedRow());
+}
+
 TEST_F(ChooserContentViewTest, SelectAndDeselectAnOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(4);
 
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
@@ skipping 80 matching lines @@
   EXPECT_EQ(1, table_view_->FirstSelectedRow());
 
   // Remove option 1.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   EXPECT_EQ(2, table_view_->RowCount());
   // No option selected.
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 }
 
+TEST_F(ChooserContentViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
+  EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(1);
+
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("b"));
+  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
+
+  // Select option 1.
+  table_view_->Select(1);
+
+  // Update option 1.
+  mock_chooser_controller_->OptionUpdated(base::ASCIIToUTF16("b"),
+                                          base::ASCIIToUTF16("d"));
+
+  EXPECT_EQ(1, table_view_->SelectedRowCount());

[msw, 2016/08/12 22:19:34]

ditto q: can you check that the selected item's name was updated?

[juncai, 2016/08/15 18:11:19]

Done.

+  EXPECT_EQ(1, table_view_->FirstSelectedRow());
+}
+
 TEST_F(ChooserContentViewTest,
        AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
 
   mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"));
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
@@ skipping 159 matching lines @@
 
 TEST_F(ChooserContentViewTest, ClickRescanLink) {
   EXPECT_CALL(*mock_chooser_controller_, RefreshOptions()).Times(1);
   chooser_content_view_->LinkClicked(nullptr, 0);
 }
 
 TEST_F(ChooserContentViewTest, ClickStyledLabelLink) {
   EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
   styled_label_->LinkClicked(nullptr, 0);
 }