Fix race in MediaDevicesPermissionChecker.

content/browser/media/media_devices_permission_checker.cc

 // Copyright 2016 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 "content/browser/media/media_devices_permission_checker.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 61 matching lines @@
 
 }  // namespace
 
 MediaDevicesPermissionChecker::MediaDevicesPermissionChecker()
     : use_override_(base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeUIForMediaStream)),
       override_value_(
           base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
               switches::kUseFakeUIForMediaStream) != "deny") {}
 
+MediaDevicesPermissionChecker::MediaDevicesPermissionChecker(
+    bool override_value)
+    : use_override_(true), override_value_(override_value) {}
+
 bool MediaDevicesPermissionChecker::CheckPermissionOnUIThread(
     MediaDeviceType device_type,
     int render_process_id,
     int render_frame_id,
-    const url::Origin& security_origin) {
+    const url::Origin& security_origin) const {
   if (use_override_)
     return override_value_;
 
   return CheckSinglePermissionOnUIThread(device_type, render_process_id,
                                          render_frame_id, security_origin);
 }
 
 void MediaDevicesPermissionChecker::CheckPermission(
     MediaDeviceType device_type,
     int render_process_id,
     int render_frame_id,
     const url::Origin& security_origin,
-    const base::Callback<void(bool)>& callback) {
+    const base::Callback<void(bool)>& callback) const {
   if (use_override_) {
     callback.Run(override_value_);
     return;
   }
 
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CheckSinglePermissionOnUIThread, device_type,
                  render_process_id, render_frame_id, security_origin),
       callback);
 }
 
 MediaDevicesManager::BoolDeviceTypes
 MediaDevicesPermissionChecker::CheckPermissionsOnUIThread(
     MediaDevicesManager::BoolDeviceTypes requested_device_types,
     int render_process_id,
     int render_frame_id,
-    const url::Origin& security_origin) {
+    const url::Origin& security_origin) const {
   if (use_override_) {
     MediaDevicesManager::BoolDeviceTypes result;
     result.fill(override_value_);
     return result;
   }
 
   return DoCheckPermissionsOnUIThread(requested_device_types, render_process_id,
                                       render_frame_id, security_origin);
 }
 
 void MediaDevicesPermissionChecker::CheckPermissions(
     MediaDevicesManager::BoolDeviceTypes requested,
     int render_process_id,
     int render_frame_id,
     const url::Origin& security_origin,
     const base::Callback<void(const MediaDevicesManager::BoolDeviceTypes&)>&
-        callback) {
+        callback) const {
   if (use_override_) {
     MediaDevicesManager::BoolDeviceTypes result;
     result.fill(override_value_);
     callback.Run(result);
     return;
   }
 
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DoCheckPermissionsOnUIThread, requested, render_process_id,
                  render_frame_id, security_origin),
       callback);
 }
 
-void MediaDevicesPermissionChecker::OverridePermissionsForTesting(
-    bool override_value) {
-  use_override_ = true;
-  override_value_ = override_value;
-}
-
 }  // namespace content