Refactor ChooserBubbleController

chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 1432 matching lines @@
       'browser/status_icons/desktop_notification_balloon.cc',
       'browser/status_icons/desktop_notification_balloon.h',
       'browser/sync/glue/extension_data_type_controller.cc',
       'browser/sync/glue/extension_data_type_controller.h',
       'browser/sync/glue/extension_setting_data_type_controller.cc',
       'browser/sync/glue/extension_setting_data_type_controller.h',
       'browser/sync/sync_ui_util.cc',
       'browser/sync/sync_ui_util.h',
       'browser/upgrade_detector.cc',
       'browser/upgrade_detector.h',
-      'browser/usb/usb_chooser_bubble_controller.cc',
-      'browser/usb/usb_chooser_bubble_controller.h',
+      'browser/usb/usb_chooser_controller.cc',
+      'browser/usb/usb_chooser_controller.h',
       'browser/usb/web_usb_chooser_service.cc',
       'browser/usb/web_usb_chooser_service.h',
     ],
     'chrome_browser_win_sources': [
       'browser/first_run/try_chrome_dialog_view.cc',
       'browser/first_run/try_chrome_dialog_view.h',
       'browser/first_run/upgrade_util.cc',
       'browser/google/did_run_updater_win.cc',
       'browser/google/did_run_updater_win.h',
       'browser/hang_monitor/hang_crash_dump_win.cc',
@@ skipping 2793 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }