Remove Close button for chooser bubble and call CloseBubble when Cancel

chrome/browser/usb/web_usb_permission_bubble.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/usb/web_usb_permission_bubble.h"
 
+#include <utility>
+
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_bubble_manager.h"
 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
 #include "components/bubble/bubble_controller.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 
 ChromeWebUsbPermissionBubble::ChromeWebUsbPermissionBubble(
     content::RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(render_frame_host);
 }
 
 ChromeWebUsbPermissionBubble::~ChromeWebUsbPermissionBubble() {
   for (const auto& bubble : bubbles_) {
     if (bubble)
       bubble->CloseBubble(BUBBLE_CLOSE_FORCED);
   }
 }
 
 void ChromeWebUsbPermissionBubble::GetPermission(
     mojo::Array<device::usb::DeviceFilterPtr> device_filters,
     const GetPermissionCallback& callback) {
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host_);
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
-  scoped_ptr<BubbleDelegate> bubble_delegate(new UsbChooserBubbleDelegate(
-      browser, device_filters.Pass(), render_frame_host_, callback));
-  BubbleReference bubble_reference =
-      browser->GetBubbleManager()->ShowBubble(bubble_delegate.Pass());
-  bubbles_.push_back(bubble_reference);
+  scoped_ptr<UsbChooserBubbleDelegate> bubble_delegate(
+      new UsbChooserBubbleDelegate(browser, std::move(device_filters),
+                                   render_frame_host_, callback));
+  UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get();
+  BubbleReference bubble_controller =
+      browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate));
+  bubble_delegate_ptr->set_bubble_controller(bubble_controller);
+  bubbles_.push_back(bubble_controller);
 }
 
 void ChromeWebUsbPermissionBubble::Bind(
     mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   bindings_.AddBinding(this, request.Pass());
 }