Show device connection and paired status in chooser on 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 76 matching lines @@
   // No option selected.
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_TRUE(discovery_state_->text().empty());
 }
 
 TEST_F(ChooserContentViewTest, AddOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(0);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
+  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));
   // |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);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_EQ(2, table_view_->RowCount());
   EXPECT_EQ(base::ASCIIToUTF16("b"), 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_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_EQ(3, table_view_->RowCount());
   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, RemoveOption) {
   // Called from TableView::OnItemsRemoved().
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      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(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.
@@ skipping 21 matching lines @@
       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"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
-      MockChooserController::kSignalStrengthLevel2Bar);
+      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(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"),
-                                        MockChooserController::kNoImage);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   EXPECT_EQ(1, table_view_->RowCount());
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   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"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_EQ(2, table_view_->RowCount());
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar);
+      base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   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"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
-      MockChooserController::kSignalStrengthLevel2Bar);
+      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(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"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
 
   // Unselect option 0.
   table_view_->Select(-1);
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(1, table_view_->FirstSelectedRow());
 
   // Unselect option 1.
   table_view_->Select(-1);
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 }
 
 TEST_F(ChooserContentViewTest, SelectAnOptionAndThenSelectAnotherOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(1, table_view_->FirstSelectedRow());
 
   // Select option 2.
   table_view_->Select(2);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(2, table_view_->FirstSelectedRow());
 }
 
 TEST_F(ChooserContentViewTest, SelectAnOptionAndRemoveAnotherOption) {
   // Called one time from TableView::Select() and two times from
   // TableView::OnItemsRemoved().
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(1, table_view_->FirstSelectedRow());
 
   // Remove option 0, the list becomes: b c.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("a"));
   EXPECT_EQ(2, table_view_->RowCount());
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   // Since option 0 is removed, the original selected option 1 becomes
   // the first option in the list.
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
 
   // Remove option 1.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
   EXPECT_EQ(1, table_view_->RowCount());
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
 }
 
 TEST_F(ChooserContentViewTest, SelectAnOptionAndRemoveTheSelectedOption) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   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"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 1.
   table_view_->Select(1);
 
   // Update option 1.
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
-      MockChooserController::kSignalStrengthLevel2Bar);
+      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(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::kNoImage);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
 
   // Remove option 0.
   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.
@@ skipping 23 matching lines @@
   // |table_view_| should be disabled since there is no option shown.
   EXPECT_FALSE(table_view_->enabled());
   // No option selected.
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_TRUE(discovery_state_->enabled());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN),
             discovery_state_->text());
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+
   table_view_->Select(1);
 
   mock_chooser_controller_->OnAdapterPresenceChanged(
       content::BluetoothChooser::AdapterPresence::POWERED_OFF);
   EXPECT_EQ(0u, mock_chooser_controller_->NumOptions());
   EXPECT_TRUE(table_view_->visible());
   // Since "Bluetooth turned off." 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_BLUETOOTH_DEVICE_CHOOSER_ADAPTER_OFF),
@@ skipping 20 matching lines @@
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_TRUE(discovery_state_->enabled());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN),
             discovery_state_->text());
 }
 
 TEST_F(ChooserContentViewTest, DiscoveringAndNoOptionAddedAndIdle) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(2);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   table_view_->Select(1);
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::DISCOVERING);
   EXPECT_FALSE(table_view_->visible());
   EXPECT_TRUE(throbber_->visible());
   // |discovery_state_| is disabled and shows a label instead of a link.
   EXPECT_FALSE(discovery_state_->enabled());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING),
             discovery_state_->text());
@@ skipping 15 matching lines @@
   EXPECT_FALSE(throbber_->visible());
   // |discovery_state_| is enabled and shows a link.
   EXPECT_TRUE(discovery_state_->enabled());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN),
             discovery_state_->text());
 }
 
 TEST_F(ChooserContentViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(3);
 
-  mock_chooser_controller_->OptionAdded(base::ASCIIToUTF16("a"),
-                                        MockChooserController::kNoImage);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar);
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar);
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   table_view_->Select(1);
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::DISCOVERING);
   mock_chooser_controller_->OptionAdded(
-      base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar);
+      base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_TRUE(table_view_->visible());
   EXPECT_EQ(1, table_view_->RowCount());
   EXPECT_EQ(base::ASCIIToUTF16("d"), 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());
   EXPECT_FALSE(throbber_->visible());
   // |discovery_state_| is disabled and shows a label instead of a link.
@@ skipping 22 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);
 }