Fix race in MediaDevicesPermissionChecker.

content/browser/media/media_devices_permission_checker.cc

Index: content/browser/media/media_devices_permission_checker.cc
diff --git a/content/browser/media/media_devices_permission_checker.cc b/content/browser/media/media_devices_permission_checker.cc
index 813ba9e66f6928ce4d18815648c940fbf72d47bb..d18a0a0a42cbba4261ac5590f6eb0a5d604ec7fc 100644
--- a/content/browser/media/media_devices_permission_checker.cc
+++ b/content/browser/media/media_devices_permission_checker.cc
@@ -79,11 +79,15 @@ MediaDevicesPermissionChecker::MediaDevicesPermissionChecker()
           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_;
 
@@ -96,7 +100,7 @@ void MediaDevicesPermissionChecker::CheckPermission(
     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;
@@ -114,7 +118,7 @@ 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_);
@@ -131,7 +135,7 @@ void MediaDevicesPermissionChecker::CheckPermissions(
     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_);
@@ -146,10 +150,4 @@ void MediaDevicesPermissionChecker::CheckPermissions(
       callback);
 }
 
-void MediaDevicesPermissionChecker::OverridePermissionsForTesting(
-    bool override_value) {
-  use_override_ = true;
-  override_value_ = override_value;
-}
-
 }  // namespace content