Show device connection and paired status in chooser on non-Mac

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 82 matching lines @@
 
 TEST_F(ChooserContentViewTest, AddOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(0);
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
   EXPECT_EQ(1, table_view_->RowCount());
-  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(

[msw, 2016/09/09 23:16:03]

nit: make a local helper like base::string16 GetPairedText(std::string device)

[juncai, 2016/09/15 17:43:55]

Done.

+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                base::ASCIIToUTF16("a")),
+            table_model_->GetText(0, 0));
   // |table_view_| should be enabled since there is an option.
   EXPECT_TRUE(table_view_->enabled());
   // No option selected.
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_EQ(2, table_view_->RowCount());
@@ skipping 23 matching lines @@
           MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
 
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   EXPECT_EQ(2, table_view_->RowCount());
-  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                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());
 
   // Remove a non-existent option, the number of rows should not change.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("non-existent"));
   EXPECT_EQ(2, table_view_->RowCount());
-  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                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());
 
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
   EXPECT_EQ(1, table_view_->RowCount());
-  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                base::ASCIIToUTF16("a")),
+            table_model_->GetText(0, 0));
   EXPECT_TRUE(table_view_->enabled());
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 
   mock_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_->RowCount());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT),
@@ skipping 18 matching lines @@
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
 
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
   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(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                base::ASCIIToUTF16("a")),
+            table_model_->GetText(0, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                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);
 
@@ skipping 41 matching lines @@
 
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
 
   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(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                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(
@@ skipping 145 matching lines @@
 
   // Update option 1.
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
 
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(1, table_view_->FirstSelectedRow());
-  EXPECT_EQ(base::ASCIIToUTF16("a"), table_model_->GetText(0, 0));
-  EXPECT_EQ(base::ASCIIToUTF16("d"), table_model_->GetText(1, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                base::ASCIIToUTF16("a")),
+            table_model_->GetText(0, 0));
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT,
+                base::ASCIIToUTF16("d")),
+            table_model_->GetText(1, 0));
   EXPECT_EQ(base::ASCIIToUTF16("c"), table_model_->GetText(2, 0));
 }
 
 TEST_F(ChooserContentViewTest,
        AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
       MockChooserController::kNoSignalStrengthLevelImage,
@@ skipping 193 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);
 }