Make WebBluetooth chooser consistent on Android and desktops (desktop part)

chrome/browser/ui/views/chooser_content_view_unittest.cc

Index: chrome/browser/ui/views/chooser_content_view_unittest.cc
diff --git a/chrome/browser/ui/views/chooser_content_view_unittest.cc b/chrome/browser/ui/views/chooser_content_view_unittest.cc
index abea874e43a65d5fcaf538b33f621b6a1d966570..f35b3c834c19f1d5b3c20b739cdf00973d8c4ac2 100644
--- a/chrome/browser/ui/views/chooser_content_view_unittest.cc
+++ b/chrome/browser/ui/views/chooser_content_view_unittest.cc
@@ -49,26 +49,19 @@ class ChooserContentViewTest : public views::ViewsTestBase {
     mock_table_view_observer_.reset(new MockTableViewObserver());
     chooser_content_view_.reset(new ChooserContentView(
         mock_table_view_observer_.get(), std::move(mock_chooser_controller)));
-    table_view_ = chooser_content_view_->table_view_for_test();
+    table_view_ = chooser_content_view_->table_view_;
     ASSERT_TRUE(table_view_);
     table_model_ = table_view_->model();
     ASSERT_TRUE(table_model_);
-    throbber_ = chooser_content_view_->throbber_for_test();
+    throbber_ = chooser_content_view_->throbber_;
     ASSERT_TRUE(throbber_);
-    turn_adapter_off_help_ =
-        chooser_content_view_->turn_adapter_off_help_for_test();
+    turn_adapter_off_help_ = chooser_content_view_->turn_adapter_off_help_;
     ASSERT_TRUE(turn_adapter_off_help_);
-    discovery_state_.reset(chooser_content_view_->CreateExtraView());
-    ASSERT_TRUE(discovery_state_);
-    help_link_.reset(chooser_content_view_->CreateFootnoteView());
-    ASSERT_TRUE(help_link_);
+    footnote_link_.reset(chooser_content_view_->CreateFootnoteView());
+    ASSERT_TRUE(footnote_link_);
   }
 
  protected:
-  // |discovery_state_| needs to be valid when |chooser_content_view_| is
-  // released, since ChooserContentView's destructor needs to access it.
-  // So it is declared before |chooser_content_view_|.
-  std::unique_ptr<views::Link> discovery_state_;
   std::unique_ptr<MockTableViewObserver> mock_table_view_observer_;
   std::unique_ptr<ChooserContentView> chooser_content_view_;
   MockChooserController* mock_chooser_controller_;
@@ -76,7 +69,7 @@ class ChooserContentViewTest : public views::ViewsTestBase {
   ui::TableModel* table_model_;
   views::Throbber* throbber_;
   views::StyledLabel* turn_adapter_off_help_;
-  std::unique_ptr<views::StyledLabel> help_link_;
+  std::unique_ptr<views::StyledLabel> footnote_link_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChooserContentViewTest);
@@ -99,7 +92,7 @@ TEST_F(ChooserContentViewTest, InitialState) {
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_FALSE(turn_adapter_off_help_->visible());
-  EXPECT_TRUE(discovery_state_->text().empty());
+  EXPECT_EQ(chooser_content_view_->help_text_, footnote_link_->text());
 }
 
 TEST_F(ChooserContentViewTest, AddOption) {
@@ -494,9 +487,8 @@ TEST_F(ChooserContentViewTest, AdapterOnAndOffAndOn) {
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_FALSE(turn_adapter_off_help_->visible());
-  EXPECT_TRUE(discovery_state_->enabled());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN),
-            discovery_state_->text());
+  EXPECT_EQ(chooser_content_view_->help_and_re_scan_text_,
+            footnote_link_->text());
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
@@ -518,8 +510,7 @@ TEST_F(ChooserContentViewTest, AdapterOnAndOffAndOn) {
   EXPECT_FALSE(table_view_->visible());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_TRUE(turn_adapter_off_help_->visible());
-  EXPECT_FALSE(discovery_state_->enabled());
-  EXPECT_TRUE(discovery_state_->text().empty());
+  EXPECT_EQ(chooser_content_view_->help_text_, footnote_link_->text());
 
   mock_chooser_controller_->OnAdapterPresenceChanged(
       content::BluetoothChooser::AdapterPresence::POWERED_ON);
@@ -534,9 +525,8 @@ TEST_F(ChooserContentViewTest, AdapterOnAndOffAndOn) {
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   EXPECT_FALSE(throbber_->visible());
   EXPECT_FALSE(turn_adapter_off_help_->visible());
-  EXPECT_TRUE(discovery_state_->enabled());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN),
-            discovery_state_->text());
+  EXPECT_EQ(chooser_content_view_->help_and_re_scan_text_,
+            footnote_link_->text());
 }
 
 TEST_F(ChooserContentViewTest, DiscoveringAndNoOptionAddedAndIdle) {
@@ -559,10 +549,8 @@ TEST_F(ChooserContentViewTest, DiscoveringAndNoOptionAddedAndIdle) {
       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());
+  EXPECT_EQ(chooser_content_view_->help_and_scanning_text_,
+            footnote_link_->text());
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::IDLE);
@@ -579,10 +567,8 @@ TEST_F(ChooserContentViewTest, DiscoveringAndNoOptionAddedAndIdle) {
   EXPECT_EQ(0, table_view_->SelectedRowCount());
   EXPECT_EQ(-1, table_view_->FirstSelectedRow());
   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());
+  EXPECT_EQ(chooser_content_view_->help_and_re_scan_text_,
+            footnote_link_->text());
 }
 
 TEST_F(ChooserContentViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
@@ -615,10 +601,8 @@ TEST_F(ChooserContentViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
   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.
-  EXPECT_FALSE(discovery_state_->enabled());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING),
-            discovery_state_->text());
+  EXPECT_EQ(chooser_content_view_->help_and_scanning_text_,
+            footnote_link_->text());
   table_view_->Select(0);
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
@@ -633,10 +617,8 @@ TEST_F(ChooserContentViewTest, DiscoveringAndOneOptionAddedAndSelectedAndIdle) {
   EXPECT_EQ(1, table_view_->SelectedRowCount());
   EXPECT_EQ(0, table_view_->FirstSelectedRow());
   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());
+  EXPECT_EQ(chooser_content_view_->help_and_re_scan_text_,
+            footnote_link_->text());
 }
 
 TEST_F(ChooserContentViewTest, ClickAdapterOffHelpLink) {
@@ -646,10 +628,12 @@ TEST_F(ChooserContentViewTest, ClickAdapterOffHelpLink) {
 
 TEST_F(ChooserContentViewTest, ClickRescanLink) {
   EXPECT_CALL(*mock_chooser_controller_, RefreshOptions()).Times(1);
-  chooser_content_view_->LinkClicked(discovery_state_.get(), 0);
+  chooser_content_view_->StyledLabelLinkClicked(
+      footnote_link_.get(), chooser_content_view_->re_scan_text_range_, 0);
 }
 
-TEST_F(ChooserContentViewTest, ClickStyledLabelLink) {
+TEST_F(ChooserContentViewTest, ClickGetHelpLink) {
   EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
-  help_link_->LinkClicked(nullptr, 0);
+  chooser_content_view_->StyledLabelLinkClicked(
+      footnote_link_.get(), chooser_content_view_->help_text_range_, 0);
 }