Remove RenderFrameHost pointer from ChooserController.

chrome/browser/usb/usb_chooser_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
 #define CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
 
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #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;
 }
 
 namespace device {
 class UsbDevice;
 struct UsbDeviceFilter;
 }
 
+class UsbChooserContext;
+
 // UsbChooserController creates a chooser for WebUSB.
 // It is owned by ChooserBubbleDelegate.
 class UsbChooserController : public ChooserController,
                              public device::UsbService::Observer {
  public:
   UsbChooserController(
       content::RenderFrameHost* render_frame_host,
       const std::vector<device::UsbDeviceFilter>& device_filters,
       const device::usb::ChooserService::GetPermissionCallback& callback);
   ~UsbChooserController() override;
@@ skipping 13 matching lines @@
 
   // device::UsbService::Observer:
   void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
   void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
 
  private:
   void GotUsbDeviceList(
       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_;
   // Maps from device name to number of devices.
   std::unordered_map<base::string16, int> device_name_map_;
   base::WeakPtrFactory<UsbChooserController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbChooserController);
 };
 
 #endif  // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_