Refactor ChooserBubbleController

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h

Index: chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h
diff --git a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h
index 42323afb4b79040f3acb24044cdeeb12657c5c8c..d5c9093c89369f37ad3d84de0ace426c9dea28c8 100644
--- a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h
+++ b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h
@@ -8,8 +8,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/website_settings/chooser_bubble_controller.h"
 #include "components/bubble/bubble_ui.h"
+#include "components/chooser_controller/chooser_controller.h"
 
 class Browser;
 @class ChooserBubbleUiController;
@@ -17,11 +17,11 @@ class Browser;
 // ChooserBubbleUiCocoa implements a chooser-based permission model.
 // It uses |NSTableView| to show a list of options 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 ChooserBubbleUiCocoa : public BubbleUi,
-                             public ChooserBubbleController::Observer {
+                             public ChooserController::Observer {
  public:
-  ChooserBubbleUiCocoa(Browser* browser,
-                       ChooserBubbleController* chooser_bubble_controller);
+  ChooserBubbleUiCocoa(Browser* browser, ChooserController* chooser_controller);
   ~ChooserBubbleUiCocoa() override;
 
   // BubbleUi:
@@ -29,7 +29,7 @@ class ChooserBubbleUiCocoa : public BubbleUi,
   void Close() override;
   void UpdateAnchorPosition() override;
 
-  // ChooserBubbleController::Observer:
+  // ChooserController::Observer:
   void OnOptionsInitialized() override;
   void OnOptionAdded(size_t index) override;
   void OnOptionRemoved(size_t index) override;
@@ -38,8 +38,8 @@ class ChooserBubbleUiCocoa : public BubbleUi,
   void OnBubbleClosing();
 
  private:
-  Browser* browser_;                                    // Weak.
-  ChooserBubbleController* chooser_bubble_controller_;  // Weak.
+  Browser* browser_;                       // Weak.
+  ChooserController* chooser_controller_;  // Weak.
   // Cocoa-side chooser bubble UI controller. Weak, as it will close itself.
   ChooserBubbleUiController* chooser_bubble_ui_controller_;