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

chrome/browser/media/permission_bubble_media_access_handler.cc

 // 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.
 
 #include "chrome/browser/media/permission_bubble_media_access_handler.h"
 
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/media/media_permission.h"
 #include "chrome/browser/media/media_stream_device_permissions.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
+#if defined(OS_ANDROID)
+#include <vector>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
+
+namespace {
+// Callback for the permission update infobar when the site and Chrome
+// permissions are mismatched on Android.
+void OnPermissionConflictResolved(
+    scoped_ptr<MediaStreamDevicesController> controller, bool allowed) {
+  if (allowed)
+    controller->PermissionGranted();
+  else
+    controller->Cancelled();
+}
+}  // namespace
+
+#endif  // OS_ANDROID
+
 using content::BrowserThread;
 
 struct PermissionBubbleMediaAccessHandler::PendingAccessRequest {
   PendingAccessRequest(const content::MediaStreamRequest& request,
                        const content::MediaResponseCallback& callback)
       : request(request), callback(callback) {}
   ~PendingAccessRequest() {}
 
   // TODO(gbillock): make the MediaStreamDevicesController owned by
   // this object when we're using bubbles.
@@ skipping 65 matching lines @@
   std::map<content::WebContents*, RequestsQueue>::iterator it =
       pending_requests_.find(web_contents);
 
   if (it == pending_requests_.end() || it->second.empty()) {
     // Don't do anything if the tab was closed.
     return;
   }
 
   DCHECK(!it->second.empty());
 
+  scoped_ptr<MediaStreamDevicesController> controller(
+      new MediaStreamDevicesController(
+          web_contents, it->second.front().request,
+          base::Bind(
+              &PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
+              base::Unretained(this), web_contents)));
+  if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo()) {
+#if defined(OS_ANDROID)
+    // If either audio or video was previously allowed and Chrome no longer has
+    // the necessary permissions, show a infobar to attempt to address this
+    // mismatch.
+    if (controller->IsAllowedForAudio() || controller->IsAllowedForVideo()) {
+      std::vector<ContentSettingsType> content_settings_types;
+      if (controller->IsAllowedForAudio())
+        content_settings_types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+      if (controller->IsAllowedForVideo())
+        content_settings_types.push_back(
+            CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+
+      if (PermissionUpdateInfoBarDelegate::ShouldShowPermissionInfobar(
+          web_contents, content_settings_types)) {
+        PermissionUpdateInfoBarDelegate::Create(
+            web_contents, content_settings_types,
+            base::Bind(
+                &OnPermissionConflictResolved, base::Passed(&controller)));
+      }
+    }
+#endif
+    return;
+  }
+
   if (PermissionBubbleManager::Enabled()) {
-    scoped_ptr<MediaStreamDevicesController> controller(
-        new MediaStreamDevicesController(
-            web_contents, it->second.front().request,
-            base::Bind(
-                &PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
-                base::Unretained(this), web_contents)));
-    if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo())
-      return;
     PermissionBubbleManager* bubble_manager =
         PermissionBubbleManager::FromWebContents(web_contents);
     if (bubble_manager)
       bubble_manager->AddRequest(controller.release());
-    return;
+  } else {
+    // TODO(gbillock): delete this block and the MediaStreamInfoBarDelegate
+    // when we've transitioned to bubbles. (crbug/337458)
+    MediaStreamInfoBarDelegate::Create(web_contents, controller.Pass());
   }
-
-  // TODO(gbillock): delete this block and the MediaStreamInfoBarDelegate
-  // when we've transitioned to bubbles. (crbug/337458)
-  MediaStreamInfoBarDelegate::Create(
-      web_contents, it->second.front().request,
-      base::Bind(&PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
-                 base::Unretained(this), web_contents));
 }
 
 void PermissionBubbleMediaAccessHandler::UpdateMediaRequestState(
     int render_process_id,
     int render_frame_id,
     int page_request_id,
     content::MediaStreamType stream_type,
     content::MediaRequestState state) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (state != content::MEDIA_REQUEST_STATE_CLOSING)
@@ skipping 56 matching lines @@
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     content::WebContents* web_contents =
         content::Source<content::WebContents>(source).ptr();
     pending_requests_.erase(web_contents);
   }
 }