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

chrome/browser/ui/app_list/start_page_service.cc

Index: chrome/browser/ui/app_list/start_page_service.cc
diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
index 33308bcf2a541b1551a06738225d7a6bf229ab5c..4e0b2881f43a885135cb1d4b9750e0831952ac00 100644
--- a/chrome/browser/ui/app_list/start_page_service.cc
+++ b/chrome/browser/ui/app_list/start_page_service.cc
@@ -15,7 +15,7 @@
 #include "base/strings/string_piece.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/media/media_stream_infobar_delegate.h"
+#include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
@@ -156,7 +156,8 @@ class StartPageService::StartPageWebContentsDelegate
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) override {
-    if (MediaStreamInfoBarDelegate::Create(web_contents, request, callback))
+    MediaStreamDevicesController controller(web_contents, request, callback);
+    if (controller.IsAskingForVideo() || controller.IsAskingForAudio())
       NOTREACHED() << "Media stream not allowed for WebUI";
   }