Remove RenderFrameHost pointer from ChooserController.

chrome/browser/usb/usb_chooser_controller.h

Index: chrome/browser/usb/usb_chooser_controller.h
diff --git a/chrome/browser/usb/usb_chooser_controller.h b/chrome/browser/usb/usb_chooser_controller.h
index 95f5807053a8adcedee6ffad777608eb7b39ea80..5981f86f884f1dd27787bc7eb4d10f692554549a 100644
--- a/chrome/browser/usb/usb_chooser_controller.h
+++ b/chrome/browser/usb/usb_chooser_controller.h
@@ -16,6 +16,7 @@
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #include "device/usb/public/interfaces/chooser_service.mojom.h"
 #include "device/usb/usb_service.h"
+#include "url/gurl.h"
 
 namespace content {
 class RenderFrameHost;
@@ -26,6 +27,8 @@ class UsbDevice;
 struct UsbDeviceFilter;
 }
 
+class UsbChooserContext;
+
 // UsbChooserController creates a chooser for WebUSB.
 // It is owned by ChooserBubbleDelegate.
 class UsbChooserController : public ChooserController,
@@ -59,11 +62,16 @@ class UsbChooserController : public ChooserController,
       const std::vector<scoped_refptr<device::UsbDevice>>& devices);
   bool DisplayDevice(scoped_refptr<device::UsbDevice> device) const;
 
-  content::RenderFrameHost* const render_frame_host_;
+  std::vector<device::UsbDeviceFilter> filters_;
   device::usb::ChooserService::GetPermissionCallback callback_;
+  GURL requesting_origin_;
+  GURL embedding_origin_;
+  bool embedded_frame_;

[juncai, 2017/03/14 00:10:48]

nit: the variable name |embedded_frame_| doesn't sound like a bool, maybe change
it to: |is_embedded_frame_|?

[Reilly Grant (use Gerrit), 2017/03/14 20:44:11]

Done.

+
+  base::WeakPtr<UsbChooserContext> chooser_context_;
   ScopedObserver<device::UsbService, device::UsbService::Observer>
       usb_service_observer_;
-  std::vector<device::UsbDeviceFilter> filters_;
+
   // Each pair is a (device, device name).
   std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
       devices_;