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

chrome/browser/ui/views/chooser_content_view.cc

Index: chrome/browser/ui/views/chooser_content_view.cc
diff --git a/chrome/browser/ui/views/chooser_content_view.cc b/chrome/browser/ui/views/chooser_content_view.cc
index 4994e715fd19312182eab62b0a1f09e60bfb414b..423a3622e092cae5f481cdfb7fc30d60e6fb61b3 100644
--- a/chrome/browser/ui/views/chooser_content_view.cc
+++ b/chrome/browser/ui/views/chooser_content_view.cc
@@ -86,6 +86,10 @@ ChooserContentView::ChooserContentView(
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   turn_adapter_off_help_->SetVisible(false);
   AddChildView(turn_adapter_off_help_);
+  footnote_link_ptr_.reset(new views::StyledLabel(help_text_, this));
+  footnote_link_ = footnote_link_ptr_.get();
+  footnote_link_->AddStyleRange(
+      help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
 }
 
 ChooserContentView::~ChooserContentView() {
@@ -280,10 +284,7 @@ bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
 }
 
 views::StyledLabel* ChooserContentView::CreateFootnoteView() {

[sky, 2016/11/08 05:04:19]

I find the usage of footnote_link_ and footnote_link_ptr_ in this class mildly
confusing. I think the confusion is because of the combination scoped_ptr and
raw pointer. I favor making ChooserContentsView *take* footnote_link_ in its
constructor. That way there you get rid of the create and it's clear someone
else owns the footnote. WDYT?

[juncai, 2016/11/08 19:43:26]

That sounds better. I modified the ChooserContentsView constructor to take a
footnote link.

Done.

-  footnote_link_ = new views::StyledLabel(help_text_, this);
-  footnote_link_->AddStyleRange(
-      help_text_range_, views::StyledLabel::RangeStyleInfo::CreateForLink());
-  return footnote_link_;
+  return footnote_link_ptr_.release();
 }
 
 void ChooserContentView::Accept() {