Fix the Web Bluetooth chooser when it is used on Chrome apps on non-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/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
@@ skipping 19 matching lines @@
 class ChooserContentViewTest : public views::ViewsTestBase {
  public:
   ChooserContentViewTest() {}
 
   // views::ViewsTestBase:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
     std::unique_ptr<MockChooserController> mock_chooser_controller(
         new MockChooserController(nullptr));
     mock_chooser_controller_ = mock_chooser_controller.get();
-    mock_table_view_observer_.reset(new MockTableViewObserver());
-    chooser_content_view_.reset(new ChooserContentView(
-        mock_table_view_observer_.get(), std::move(mock_chooser_controller)));
+    mock_table_view_observer_ = base::MakeUnique<MockTableViewObserver>();
+    chooser_content_view_ = base::MakeUnique<ChooserContentView>(
+        mock_table_view_observer_.get(), std::move(mock_chooser_controller));
     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_;
     ASSERT_TRUE(throbber_);
     turn_adapter_off_help_ = chooser_content_view_->turn_adapter_off_help_;
     ASSERT_TRUE(turn_adapter_off_help_);
-    footnote_link_.reset(chooser_content_view_->CreateFootnoteView());
+    footnote_link_ = chooser_content_view_->footnote_link();
     ASSERT_TRUE(footnote_link_);
   }
 
  protected:
   std::unique_ptr<MockTableViewObserver> mock_table_view_observer_;
   std::unique_ptr<ChooserContentView> chooser_content_view_;
-  MockChooserController* mock_chooser_controller_;
-  views::TableView* table_view_;
-  ui::TableModel* table_model_;
-  views::Throbber* throbber_;
-  views::StyledLabel* turn_adapter_off_help_;
-  std::unique_ptr<views::StyledLabel> footnote_link_;
+  MockChooserController* mock_chooser_controller_ = nullptr;
+  views::TableView* table_view_ = nullptr;
+  ui::TableModel* table_model_ = nullptr;
+  views::Throbber* throbber_ = nullptr;
+  views::StyledLabel* turn_adapter_off_help_ = nullptr;
+  views::StyledLabel* footnote_link_ = nullptr;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChooserContentViewTest);
 };
 
 TEST_F(ChooserContentViewTest, InitialState) {
   EXPECT_CALL(*mock_table_view_observer_, OnSelectionChanged()).Times(0);
 
   EXPECT_TRUE(table_view_->visible());
   // Since "No devices found." needs to be displayed on the |table_view_|,
@@ skipping 539 matching lines @@
 }
 
 TEST_F(ChooserContentViewTest, ClickAdapterOffHelpLink) {
   EXPECT_CALL(*mock_chooser_controller_, OpenAdapterOffHelpUrl()).Times(1);
   turn_adapter_off_help_->LinkClicked(nullptr, 0);
 }
 
 TEST_F(ChooserContentViewTest, ClickRescanLink) {
   EXPECT_CALL(*mock_chooser_controller_, RefreshOptions()).Times(1);
   chooser_content_view_->StyledLabelLinkClicked(
-      footnote_link_.get(), chooser_content_view_->re_scan_text_range_, 0);
+      footnote_link_, chooser_content_view_->re_scan_text_range_, 0);
 }
 
 TEST_F(ChooserContentViewTest, ClickGetHelpLink) {
   EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
   chooser_content_view_->StyledLabelLinkClicked(
-      footnote_link_.get(), chooser_content_view_->help_text_range_, 0);
+      footnote_link_, chooser_content_view_->help_text_range_, 0);
 }