Index: chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc |
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc b/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc |
index 9068e3e7bdbbbd9737484549c0480df0da82a88f..f717a49f85bcef3a083e252df91f2ce63af29aca 100644 |
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc |
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc |
@@ -75,12 +75,17 @@ TEST_F(ChooserDialogViewTest, InitialState) { |
} |
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()); |
@@ -111,12 +116,17 @@ TEST_F(ChooserDialogViewTest, SelectAndDeselectAnOption) { |
} |
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("b"), MockChooserController::kSignalStrengthLevel0Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar); |
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
EXPECT_FALSE(ok_button_->enabled()); |
EXPECT_TRUE(cancel_button_->enabled()); |
@@ -137,12 +147,17 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndThenSelectAnotherOption) { |
} |
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("b"), MockChooserController::kSignalStrengthLevel0Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar); |
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
EXPECT_FALSE(ok_button_->enabled()); |
EXPECT_TRUE(cancel_button_->enabled()); |
@@ -163,12 +178,17 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveAnotherOption) { |
} |
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()); |
@@ -185,12 +205,17 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndRemoveTheSelectedOption) { |
} |
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("b"), MockChooserController::kSignalStrengthLevel0Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar); |
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
EXPECT_FALSE(ok_button_->enabled()); |
EXPECT_TRUE(cancel_button_->enabled()); |
@@ -202,7 +227,9 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndUpdateTheSelectedOption) { |
// 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()); |
@@ -214,8 +241,11 @@ TEST_F(ChooserDialogViewTest, SelectAnOptionAndUpdateTheSelectedOption) { |
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()); |
@@ -252,12 +282,17 @@ TEST_F(ChooserDialogViewTest, AdapterOnAndOffAndOn) { |
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("b"), MockChooserController::kSignalStrengthLevel0Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar); |
+ base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
EXPECT_FALSE(ok_button_->enabled()); |
EXPECT_TRUE(cancel_button_->enabled()); |
@@ -279,12 +314,17 @@ TEST_F(ChooserDialogViewTest, AdapterOnAndOffAndOn) { |
} |
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()); |
@@ -303,18 +343,24 @@ TEST_F(ChooserDialogViewTest, DiscoveringAndNoOptionAddedAndIdle) { |
} |
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("b"), MockChooserController::kSignalStrengthLevel0Bar, |
+ MockChooserController::ConnectedPairedStatus::NONE); |
mock_chooser_controller_->OptionAdded( |
- base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar); |
+ 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()); |