Simplify logic behind chrome.audio.setActiveDevices

extensions/browser/api/audio/audio_api.cc

 // Copyright (c) 2013 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 "extensions/browser/api/audio/audio_api.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
@@ skipping 90 matching lines @@
 
 ExtensionFunction::ResponseAction AudioSetActiveDevicesFunction::Run() {
   std::unique_ptr<audio::SetActiveDevices::Params> params(
       audio::SetActiveDevices::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   AudioService* service =
       AudioAPI::GetFactoryInstance()->Get(browser_context())->GetService();
   DCHECK(service);
 
-  service->SetActiveDevices(params->ids);
+  if (params->ids.as_device_id_lists) {
+    if (!service->SetActiveDeviceLists(
+            params->ids.as_device_id_lists->input,
+            params->ids.as_device_id_lists->output)) {
+      return RespondNow(Error("Failed to set active devices."));
+    }
+  } else if (params->ids.as_strings) {
+    // TODO(tbarzic): This way of setting active devices is deprecated - have
+    // this return error for apps that were not whitelisted for deprecated
+    // version of audio API.
+    service->SetActiveDevices(*params->ids.as_strings);
+  }
   return RespondNow(NoArguments());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 ExtensionFunction::ResponseAction AudioSetPropertiesFunction::Run() {
   std::unique_ptr<audio::SetProperties::Params> params(
       audio::SetProperties::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ skipping 10 matching lines @@
   if (!service->SetDeviceProperties(params->id, params->properties.is_muted,
                                     volume_value, gain_value)) {
     return RespondNow(Error("Could not set properties"));
   }
   return RespondNow(NoArguments());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 }  // namespace extensions