Pull code associated with a Media PermissionRequest out of MediaStreamDevicesController

chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h

Index: chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h
diff --git a/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h b/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h
index 8f35ce61277117e80b6ce7f43636c78764407cd5..3caaa7b5d6a6d5c61b118e72ba5982b64f0913f3 100644
--- a/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h
+++ b/chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h
@@ -23,14 +23,16 @@ class MediaStreamInfoBarDelegateAndroid : public PermissionInfoBarDelegate {
   // then checks for an existing infobar for |web_contents| and replaces it if
   // found, or just adds the new infobar otherwise.  Returns whether an infobar
   // was created.
-  static bool Create(content::WebContents* web_contents,
-                     bool user_gesture,
-                     std::unique_ptr<MediaStreamDevicesController> controller);
+  static bool Create(
+      content::WebContents* web_contents,
+      bool user_gesture,
+      std::unique_ptr<MediaStreamDevicesController::Request> request);
 
   MediaStreamInfoBarDelegateAndroid(
       Profile* profile,
       bool user_gesture,
-      std::unique_ptr<MediaStreamDevicesController> controller);
+      std::unique_ptr<MediaStreamDevicesController::Request> request);
+
  private:
   friend class WebRtcTestBase;
 
@@ -52,7 +54,7 @@ class MediaStreamInfoBarDelegateAndroid : public PermissionInfoBarDelegate {
   int GetMessageResourceId() const override;
   std::vector<int> content_settings_types() const override;
 
-  std::unique_ptr<MediaStreamDevicesController> controller_;
+  std::unique_ptr<MediaStreamDevicesController::Request> request_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamInfoBarDelegateAndroid);
 };