BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 13 insertions, 8 deletions

diff --git a/chromium/extensions/browser/api/audio/audio_apitest_chromeos.cc b/chromium/extensions/browser/api/audio/audio_apitest_chromeos.cc
index 5b0d7ba30f5..45900d38efb 100644
--- a/chromium/extensions/browser/api/audio/audio_apitest_chromeos.cc
+++ b/chromium/extensions/browser/api/audio/audio_apitest_chromeos.cc
@@ -49,6 +49,9 @@ struct AudioNodeInfo {
   const char* const name;
 };
 
+const uint32_t kInputMaxSupportedChannels = 1;
+const uint32_t kOutputMaxSupportedChannels = 2;
+
 const AudioNodeInfo kJabraSpeaker1 = {
     false, kJabraSpeaker1Id, kJabraSpeaker1StableDeviceId, "Jabra Speaker",
     "USB", "Jabra Speaker 1"};
@@ -74,12 +77,14 @@ const AudioNodeInfo kUSBCameraMic = {
     "Webcam Mic", "USB",        "Logitech Webcam"};
 
 AudioNode CreateAudioNode(const AudioNodeInfo& info, int version) {
-  return AudioNode(info.is_input, info.id, version == 2,
-                   // stable_device_id_v1:
-                   info.stable_id,
-                   // stable_device_id_v2:
-                   version == 2 ? info.stable_id ^ 0xFFFF : 0, info.device_name,
-                   info.type, info.name, false, 0);
+  return AudioNode(
+      info.is_input, info.id, version == 2,
+      // stable_device_id_v1:
+      info.stable_id,
+      // stable_device_id_v2:
+      version == 2 ? info.stable_id ^ 0xFFFF : 0, info.device_name, info.type,
+      info.name, false, 0,
+      info.is_input ? kInputMaxSupportedChannels : kOutputMaxSupportedChannels);
 }
 
 class AudioApiTest : public ShellApiTest {
diff --git a/chromium/extensions/browser/api/audio/audio_service_chromeos.cc b/chromium/extensions/browser/api/audio/audio_service_chromeos.cc
index 40d0a4cb457..b292104a6cb 100644
--- a/chromium/extensions/browser/api/audio/audio_service_chromeos.cc
+++ b/chromium/extensions/browser/api/audio/audio_service_chromeos.cc
@@ -362,8 +362,8 @@ AudioDeviceInfo AudioServiceImpl::ToAudioDeviceInfo(
   info.is_active = device.active;
   info.level =
       device.is_input
-          ? cras_audio_handler_->GetOutputVolumePercentForDevice(device.id)
-          : cras_audio_handler_->GetInputGainPercentForDevice(device.id);
+          ? cras_audio_handler_->GetInputGainPercentForDevice(device.id)
+          : cras_audio_handler_->GetOutputVolumePercentForDevice(device.id);
   info.stable_device_id = std::make_unique<std::string>(
       id_calculator_->GetStableDeviceId(device.stable_device_id));