Show device connection and paired status in chooser on Mac

chrome/browser/ui/views/extensions/chooser_dialog_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/extensions/chooser_dialog_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
 #include "chrome/browser/ui/views/chooser_content_view.h"
@@ skipping 57 matching lines @@
   // Cancel button is always enabled.
   EXPECT_TRUE(cancel_button_->enabled());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_USB_DEVICE_CHOOSER_CONNECT_BUTTON_TEXT),
       ok_button_->GetText());
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_CANCEL_BUTTON_TEXT),
             cancel_button_->GetText());
 }
 
 TEST_F(ChooserDialogViewTest, SelectAndDeselectAnOption) {
-  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);
   // OK button is disabled since no option is selected.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 0.
   table_view_->Select(0);
   // OK button is enabled since an option is selected.
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
@@ skipping 10 matching lines @@
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Unselect option 1.
   table_view_->Select(-1);
   // OK button is disabled since no option is selected.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest, SelectAnOptionAndThenSelectAnotherOption) {
-  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);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 2.
   table_view_->Select(2);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveAnotherOption) {
-  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);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Remove option 0, the list becomes: b c.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("a"));
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Remove option 1.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("c"));
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveTheSelectedOption) {
-  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);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Remove option 1.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   // OK button is disabled since the selected option is removed.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest, SelectAnOptionAndUpdateTheSelectedOption) {
-  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);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 1.
   table_view_->Select(1);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Update option 1.
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
-      MockChooserController::kSignalStrengthLevel2Bar);
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Remove option 1.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest,
        AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
-  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_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Select option 0.
   table_view_->Select(0);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   // Remove option 0.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("a"));
@@ skipping 16 matching lines @@
   EXPECT_CALL(*mock_chooser_controller_, Close()).Times(1);
   chooser_dialog_view_->GetDialogClientView()->GetWidget()->Close();
 }
 
 TEST_F(ChooserDialogViewTest, AdapterOnAndOffAndOn) {
   mock_chooser_controller_->OnAdapterPresenceChanged(
       content::BluetoothChooser::AdapterPresence::POWERED_ON);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
-  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);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   table_view_->Select(1);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   mock_chooser_controller_->OnAdapterPresenceChanged(
       content::BluetoothChooser::AdapterPresence::POWERED_OFF);
   // Since the adapter is turned off, the previously selected option
   // becomes invalid, the OK button is disabled.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   mock_chooser_controller_->OnAdapterPresenceChanged(
       content::BluetoothChooser::AdapterPresence::POWERED_ON);
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest, DiscoveringAndNoOptionAddedAndIdle) {
-  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);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::DISCOVERING);
   // OK button is disabled since the chooser is refreshing options.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::IDLE);
   // OK button is disabled since the chooser refreshed options.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }
 
 TEST_F(ChooserDialogViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
-  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);
   // OK button is disabled since no option is selected.
   EXPECT_FALSE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
   table_view_->Select(0);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::IDLE);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }