Hoist device logic out of permissions check in MediaStreamDevicesController

chrome/browser/media/webrtc/media_permission.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/media_permission.h"
 
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_manager.h"
@@ skipping 97 matching lines @@
   // Check policy and content settings.
   ContentSetting content_setting =
       permission_manager
           ->GetPermissionStatus(content_type_, requesting_origin_,
                                 embedding_origin_)
           .content_setting;
   if (content_setting == CONTENT_SETTING_BLOCK)
     *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;
   return content_setting;
 }
-
-ContentSetting MediaPermission::GetPermissionStatusWithDeviceRequired(
-    const std::string& device_id,
-    content::MediaStreamRequestResult* denial_reason) const {
-  // Deny the request if there is no device attached to the OS of the requested
-  // type.
-  if (!HasAvailableDevices(device_id)) {
-    *denial_reason = content::MEDIA_DEVICE_NO_HARDWARE;
-    return CONTENT_SETTING_BLOCK;
-  }
-
-  return GetPermissionStatus(denial_reason);
-}
-
-bool MediaPermission::HasAvailableDevices(const std::string& device_id) const {
-  const content::MediaStreamDevices* devices = nullptr;
-  if (content_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
-    devices =
-        &MediaCaptureDevicesDispatcher::GetInstance()->GetAudioCaptureDevices();
-  } else if (content_type_ == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
-    devices =
-        &MediaCaptureDevicesDispatcher::GetInstance()->GetVideoCaptureDevices();
-  } else {
-    NOTREACHED();
-  }
-
-  // TODO(tommi): It's kind of strange to have this here since if we fail this
-  // test, there'll be a UI shown that indicates to the user that access to
-  // non-existing audio/video devices has been denied.  The user won't have
-  // any way to change that but there will be a UI shown which indicates that
-  // access is blocked.
-  if (devices->empty())
-    return false;
-
-  // Note: we check device_id before dereferencing devices. If the requested
-  // device id is non-empty, then the corresponding device list must not be
-  // NULL.
-  if (!device_id.empty() && !devices->FindById(device_id))
-    return false;
-
-  return true;
-}