Revert of Force chooser bubbles to close synchronously.

chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h

Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h
diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h
index 44000891d8019efc15f281064d9bbcabb70f7dc0..596dbd344d3ca9c654bb02fcf49a2a83c81f0c33 100644
--- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h
+++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h
@@ -10,7 +10,6 @@
 #include "base/macros.h"
 #include "components/bubble/bubble_ui.h"
 #include "ui/views/bubble/bubble_border.h"
-#include "ui/views/widget/widget_observer.h"
 
 namespace views {
 class View;
@@ -25,7 +24,7 @@
 // for user to grant permission. It can be used by the WebUSB or WebBluetooth
 // APIs. It is owned by the BubbleController, which is owned by the
 // BubbleManager.
-class ChooserBubbleUiView : public BubbleUi, public views::WidgetObserver {
+class ChooserBubbleUiView : public BubbleUi {
  public:
   ChooserBubbleUiView(Browser* browser,
                       std::unique_ptr<ChooserController> chooser_controller);
@@ -36,16 +35,13 @@
   void Close() override;
   void UpdateAnchorPosition() override;
 
-  // views::WidgetObserver:
-  void OnWidgetClosing(views::Widget* widget) override;
-
  private:
   views::View* GetAnchorView();
   views::BubbleBorder::Arrow GetAnchorArrow();
 
   Browser* browser_;  // Weak.
   // Weak. Owned by its parent view.
-  ChooserBubbleUiViewDelegate* bubble_view_ = nullptr;
+  ChooserBubbleUiViewDelegate* chooser_bubble_ui_view_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ChooserBubbleUiView);
 };