Fix the Web Bluetooth chooser when it is used on Chrome apps on non-Mac

chrome/browser/ui/views/chooser_content_view.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 "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
@@ skipping 62 matching lines @@
       IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ON_BLUETOOTH_LINK_TEXT);
   size_t offset = 0;
   base::string16 text = l10n_util::GetStringFUTF16(
       IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF, link_text, &offset);
   turn_adapter_off_help_ = new views::StyledLabel(text, this);
   turn_adapter_off_help_->AddStyleRange(
       gfx::Range(0, link_text.size()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   turn_adapter_off_help_->SetVisible(false);
   AddChildView(turn_adapter_off_help_);
+  footnote_link_ = base::MakeUnique<views::StyledLabel>(help_text_, this);
+  footnote_link_->set_owned_by_client();
+  footnote_link_->AddStyleRange(
+      help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
 }
 
 ChooserContentView::~ChooserContentView() {
   chooser_controller_->set_view(nullptr);
   table_view_->SetObserver(nullptr);
   table_view_->SetModel(nullptr);
 }
 
 gfx::Size ChooserContentView::GetPreferredSize() const {
   return gfx::Size(kChooserWidth, kChooserHeight);
@@ skipping 145 matching lines @@
 
   if (GetWidget() && GetWidget()->GetRootView())
     GetWidget()->GetRootView()->Layout();
 }
 
 void ChooserContentView::StyledLabelLinkClicked(views::StyledLabel* label,
                                                 const gfx::Range& range,
                                                 int event_flags) {
   if (label == turn_adapter_off_help_) {
     chooser_controller_->OpenAdapterOffHelpUrl();
-  } else if (label == footnote_link_) {
+  } else if (label == footnote_link_.get()) {
     if (range == help_text_range_)
       chooser_controller_->OpenHelpCenterUrl();
     else if (range == re_scan_text_range_)
       chooser_controller_->RefreshOptions();
     else
       NOTREACHED();
   } else {
     NOTREACHED();
   }
 }
 
 base::string16 ChooserContentView::GetWindowTitle() const {
   return chooser_controller_->GetTitle();
 }
 
 base::string16 ChooserContentView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK
              ? chooser_controller_->GetOkButtonLabel()
              : l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_CANCEL_BUTTON_TEXT);
 }
 
 bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return button != ui::DIALOG_BUTTON_OK ||
          !table_view_->selection_model().empty();
 }
 
-views::StyledLabel* ChooserContentView::CreateFootnoteView() {
-  footnote_link_ = new views::StyledLabel(help_text_, this);
-  footnote_link_->AddStyleRange(
-      help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
-  return footnote_link_;
-}
-
 void ChooserContentView::Accept() {
   chooser_controller_->Select(table_view_->selection_model().active());
 }
 
 void ChooserContentView::Cancel() {
   chooser_controller_->Cancel();
 }
 
 void ChooserContentView::Close() {
   chooser_controller_->Close();
 }
 
 void ChooserContentView::UpdateTableView() {
   if (chooser_controller_->NumOptions() == 0) {
     table_view_->OnModelChanged();
     table_view_->SetEnabled(false);
   } else {
     table_view_->SetEnabled(true);
   }
 }
 
 void ChooserContentView::SetGetHelpAndReScanLink() {
   footnote_link_->SetText(help_and_re_scan_text_);
   footnote_link_->AddStyleRange(
       help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
   footnote_link_->AddStyleRange(
       re_scan_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
 }