Rename web_usb_permission_bubble.cc/h and webusb_permission_bubble.mojom

chrome/browser/usb/usb_tab_helper.cc

Index: chrome/browser/usb/usb_tab_helper.cc
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index 8e235e49cbbd7a86ee9b7106805c787b1ca28c19..c82b78104dc5d7f19b02dafa1568bb57163fe0bf 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/usb/web_usb_permission_bubble.h"
+#include "chrome/browser/usb/web_usb_chooser_service.h"
 #include "chrome/browser/usb/web_usb_permission_provider.h"
 #include "device/usb/mojo/device_manager_impl.h"
 
@@ -18,7 +18,7 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper);
 
 struct FrameUsbServices {
   scoped_ptr<WebUSBPermissionProvider> permission_provider;
-  scoped_ptr<ChromeWebUsbPermissionBubble> permission_bubble;
+  scoped_ptr<WebUsbChooserService> chooser_service;
 };
 
 // static
@@ -46,10 +46,10 @@ void UsbTabHelper::CreateDeviceManager(
 }
 
 #if !defined(OS_ANDROID)
-void UsbTabHelper::CreatePermissionBubble(
+void UsbTabHelper::CreateChooserService(
     content::RenderFrameHost* render_frame_host,
-    mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
-  GetPermissionBubble(render_frame_host, std::move(request));
+    mojo::InterfaceRequest<device::ChooserService> request) {
+  GetChooserService(render_frame_host, std::move(request));
 }
 #endif  // !defined(OS_ANDROID)
 
@@ -85,14 +85,14 @@ void UsbTabHelper::GetPermissionProvider(
 }
 
 #if !defined(OS_ANDROID)
-void UsbTabHelper::GetPermissionBubble(
+void UsbTabHelper::GetChooserService(
     content::RenderFrameHost* render_frame_host,
-    mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
+    mojo::InterfaceRequest<device::ChooserService> request) {
   FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
-  if (!frame_usb_services->permission_bubble) {
-    frame_usb_services->permission_bubble.reset(
-        new ChromeWebUsbPermissionBubble(render_frame_host));
+  if (!frame_usb_services->chooser_service) {
+    frame_usb_services->chooser_service.reset(
+        new WebUsbChooserService(render_frame_host));
   }
-  frame_usb_services->permission_bubble->Bind(std::move(request));
+  frame_usb_services->chooser_service->Bind(std::move(request));
 }
 #endif  // !defined(OS_ANDROID)