Refactor ChooserBubbleController

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 66287e29688a3a5c0d41ea78584d2076fc26f01b..e7e572b14e06ff0877d476b6f541dd2ec305f5ac 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1555,8 +1555,8 @@
       'browser/ui/apps/directory_access_confirmation_dialog.h',
       'browser/ui/blocked_content/app_modal_dialog_helper.cc',
       'browser/ui/blocked_content/app_modal_dialog_helper.h',
-      'browser/ui/bluetooth/bluetooth_chooser_bubble_controller.cc',
-      'browser/ui/bluetooth/bluetooth_chooser_bubble_controller.h',
+      'browser/ui/bluetooth/bluetooth_chooser_controller.cc',
+      'browser/ui/bluetooth/bluetooth_chooser_controller.h',
       'browser/ui/bluetooth/bluetooth_chooser_desktop.cc',
       'browser/ui/bluetooth/bluetooth_chooser_desktop.h',
       'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc',
@@ -1821,8 +1821,8 @@
       'browser/ui/unload_controller.h',
       'browser/ui/user_manager.cc',
       'browser/ui/user_manager.h',
-      'browser/ui/website_settings/chooser_bubble_controller.cc',
-      'browser/ui/website_settings/chooser_bubble_controller.h',
+      'browser/ui/website_settings/chooser_bubble_delegate.cc',
+      'browser/ui/website_settings/chooser_bubble_delegate.h',
       'browser/ui/website_settings/permission_bubble_manager.cc',
       'browser/ui/website_settings/permission_bubble_manager.h',
       'browser/ui/website_settings/permission_bubble_view.h',
@@ -3321,6 +3321,7 @@
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../components/components.gyp:bubble',
+            '../components/components.gyp:chooser_controller',
             '../components/components.gyp:feedback_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',