Add throbber and status text to WebBluetooth chooser UI on non-Mac desktops

chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc

Index: chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc
index 1b65c6ca5d52618aa25ca88e2d1584ac10e095ce..8646df05e100b0a79f46ecfdb24d11b6149486d1 100644
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc
@@ -5,19 +5,25 @@
 #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/extensions/extension_browsertest.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/grit/generated_resources.h"
+#include "chrome/browser/ui/views/chooser_content_view.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/range/range.h"
+#include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
+namespace {
+
+const char kNoDevicesFound[] = "No devices found.";

[msw, 2016/07/19 22:08:11]

ditto nit: don't do this.

[juncai, 2016/07/19 22:58:24]

Done.

+
+}  // namespace
+
 class ChooserDialogViewTest : public ExtensionBrowserTest {
  public:
   ChooserDialogViewTest() {}
@@ -30,7 +36,8 @@ class ChooserDialogViewTest : public ExtensionBrowserTest {
     std::unique_ptr<ChooserDialogView> chooser_dialog_view(
         new ChooserDialogView(std::move(mock_chooser_controller)));
     chooser_dialog_view_ = chooser_dialog_view.get();
-    table_view_ = chooser_dialog_view_->table_view_for_test();
+    table_view_ = chooser_dialog_view_->chooser_content_view_for_test()
+                      ->table_view_for_test();
     ASSERT_TRUE(table_view_);
     table_model_ = table_view_->model();
     ASSERT_TRUE(table_model_);
@@ -39,6 +46,9 @@ class ChooserDialogViewTest : public ExtensionBrowserTest {
         platform_util::GetViewForWindow(
             browser()->window()->GetNativeWindow()));
     modal_dialog->Show();
+    styled_label_ = chooser_dialog_view_->chooser_content_view_for_test()
+                        ->styled_label_for_test();
+    ASSERT_TRUE(styled_label_);
   }
 
  protected:
@@ -46,6 +56,7 @@ class ChooserDialogViewTest : public ExtensionBrowserTest {
   ChooserDialogView* chooser_dialog_view_;
   views::TableView* table_view_;
   ui::TableModel* table_model_;
+  views::StyledLabel* styled_label_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChooserDialogViewTest);
@@ -54,15 +65,13 @@ class ChooserDialogViewTest : public ExtensionBrowserTest {
 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, InitialState) {
   // Since "No devices found." needs to be displayed on the |table_view_|,
   // the number of rows is 1.
-  EXPECT_EQ(table_view_->RowCount(), 1);
-  EXPECT_EQ(
-      table_model_->GetText(0, 0),
-      l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT));
+  EXPECT_EQ(1, table_view_->RowCount());
+  EXPECT_EQ(base::ASCIIToUTF16(kNoDevicesFound), table_model_->GetText(0, 0));
   // |table_view_| should be disabled since there is no option shown.
   EXPECT_FALSE(table_view_->enabled());
   // No option selected.
-  EXPECT_EQ(table_view_->SelectedRowCount(), 0);
-  EXPECT_EQ(table_view_->FirstSelectedRow(), -1);
+  EXPECT_EQ(0, table_view_->SelectedRowCount());
+  EXPECT_EQ(-1, table_view_->FirstSelectedRow());
 }
 
 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, Accept) {
@@ -82,5 +91,5 @@ IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, Close) {
 
 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, ClickStyledLabelLink) {
   EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
-  chooser_dialog_view_->StyledLabelLinkClicked(nullptr, gfx::Range(), 0);
+  styled_label_->LinkClicked(nullptr, 0);
 }