Add logic to resolve permission mismatches in Android M for webrtc.

chrome/browser/media/media_stream_infobar_delegate.h

Index: chrome/browser/media/media_stream_infobar_delegate.h
diff --git a/chrome/browser/media/media_stream_infobar_delegate.h b/chrome/browser/media/media_stream_infobar_delegate.h
index 9bf55d7f570033458a942c569581d65a91d4a8e4..0d63d0e27af15d30de6674463bac61e97b236cfe 100644
--- a/chrome/browser/media/media_stream_infobar_delegate.h
+++ b/chrome/browser/media/media_stream_infobar_delegate.h
@@ -21,14 +21,12 @@ class MediaStreamInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   ~MediaStreamInfoBarDelegate() override;
 
-  // Handles a permission request (in |request|) for |web_contents|.  If this
-  // involves prompting the user, creates a media stream infobar and delegate,
+  // Prompts the user by creating a media stream infobar and delegate,
   // 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,
-                     const content::MediaStreamRequest& request,
-                     const content::MediaResponseCallback& callback);
+                     scoped_ptr<MediaStreamDevicesController> controller);
 
   bool IsRequestingVideoAccess() const;
   bool IsRequestingMicrophoneAccess() const;