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

chrome/browser/ui/views/extensions/chooser_dialog_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/extensions/chooser_dialog_view.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
 #include "chrome/browser/ui/views/chooser_content_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
+#include "ui/views/test/native_widget_factory.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 class ChooserDialogViewTest : public views::ViewsTestBase {
  public:
   ChooserDialogViewTest() {}
   ~ChooserDialogViewTest() override {}
 
   // 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();
     std::unique_ptr<ChooserDialogView> chooser_dialog_view(
         new ChooserDialogView(std::move(mock_chooser_controller)));
-    footnote_link_.reset(chooser_dialog_view->chooser_content_view_for_test()
-                             ->CreateFootnoteView());
     chooser_dialog_view_ = chooser_dialog_view.get();
     table_view_ =
         chooser_dialog_view_->chooser_content_view_for_test()->table_view_;
     ASSERT_TRUE(table_view_);
+
+    views::Widget::InitParams params =
+        CreateParams(views::Widget::InitParams::TYPE_WINDOW);
+    params.bounds = gfx::Rect(0, 0, 600, 600);
+    params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+    params.native_widget = views::test::CreatePlatformDesktopNativeWidgetImpl(
+        params, &parent_widget, nullptr);
+    parent_widget.Init(params);
+
     dialog_ = views::DialogDelegate::CreateDialogWidget(
-        chooser_dialog_view.release(), GetContext(), nullptr);
+        chooser_dialog_view.release(), GetContext(),
+        parent_widget.GetNativeView());
     ASSERT_TRUE(dialog_);
     ok_button_ = chooser_dialog_view_->GetDialogClientView()->ok_button();
     ASSERT_TRUE(ok_button_);
     cancel_button_ =
         chooser_dialog_view_->GetDialogClientView()->cancel_button();
     ASSERT_TRUE(cancel_button_);
   }
 
   // views::ViewsTestBase:
   void TearDown() override {
     dialog_->CloseNow();
+    parent_widget.CloseNow();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   MockChooserController* mock_chooser_controller_;
   ChooserDialogView* chooser_dialog_view_;
-  std::unique_ptr<views::StyledLabel> footnote_link_;
+  views::Widget parent_widget;

[sky, 2016/11/09 17:55:47]

parent_widget_. Also, I think it better to wrap the widget in a unique_ptr. That
way it isn't created/destroyed before/after ViewsTestBase.

[juncai, 2016/11/09 20:25:02]

Done.

   views::TableView* table_view_;
   views::LabelButton* ok_button_;
   views::LabelButton* cancel_button_;
   views::Widget* dialog_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChooserDialogViewTest);
 };
 
 TEST_F(ChooserDialogViewTest, InitialState) {
@@ skipping 300 matching lines @@
   EXPECT_TRUE(cancel_button_->enabled());
   table_view_->Select(0);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 
   mock_chooser_controller_->OnDiscoveryStateChanged(
       content::BluetoothChooser::DiscoveryState::IDLE);
   EXPECT_TRUE(ok_button_->enabled());
   EXPECT_TRUE(cancel_button_->enabled());
 }