Implement modal permission prompts for media permissions on Android.

chrome/browser/media/webrtc/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/webrtc/permission_bubble_media_access_handler.h"
 
 #include <utility>
 
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/media/webrtc/media_permission.h"
 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/features.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 BUILDFLAG(ANDROID_JAVA_UI)
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"
 #include "chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.h"
+#include "chrome/browser/permissions/permission_dialog_delegate.h"
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 #else
 #include "chrome/browser/permissions/permission_request_manager.h"
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 namespace {
 // Callback for the permission update infobar when the site and Chrome
 // permissions are mismatched on Android.
 void OnPermissionConflictResolved(
@@ skipping 144 matching lines @@
       PermissionUpdateInfoBarDelegate::Create(
           web_contents, content_settings_types,
           base::Bind(
               &OnPermissionConflictResolved, base::Passed(&controller)));
     }
 #endif
     return;
   }
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  MediaStreamInfoBarDelegateAndroid::Create(web_contents,
-                                            std::move(controller));
+  if (PermissionDialogDelegate::ShouldShowDialog(request.user_gesture)) {
+    PermissionDialogDelegate::CreateMediaStreamDialog(web_contents,

[raymes, 2016/11/02 08:09:04]

Hmm - there seems to be some logic in MediaStreamInfoBarDelegateAndroid::Create
that may be important:

if (!infobar_service) {
    // Deny the request if there is no place to show the infobar, e.g. when
    // the request comes from a background extension page.
    controller->Cancelled();
    return false;
  }

We may need to keep this logic?

[dominickn, 2016/11/03 00:34:09]

I don't think it's possible for anything except a real tab to request this
permission on Android (e.g. there are no extensions).

+                                                      std::move(controller));
+  } else {
+    MediaStreamInfoBarDelegateAndroid::Create(web_contents,
+                                              std::move(controller));
+  }
 #else
   PermissionRequestManager* permission_request_manager =
       PermissionRequestManager::FromWebContents(web_contents);
   if (permission_request_manager)
     permission_request_manager->AddRequest(controller.release());
 #endif
 }
 
 void PermissionBubbleMediaAccessHandler::UpdateMediaRequestState(
     int render_process_id,
@@ skipping 60 matching lines @@
 
 void PermissionBubbleMediaAccessHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DESTROYED, type);
 
   pending_requests_.erase(content::Source<content::WebContents>(source).ptr());
 }