audio API: Use an enum for audio device device type

extensions/browser/api/audio/audio_service_chromeos.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_service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "chromeos/audio/audio_device.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
 using api::audio::OutputDeviceInfo;
 using api::audio::InputDeviceInfo;
 using api::audio::AudioDeviceInfo;
 
+namespace {
+
+api::audio::DeviceType GetAsAudioApiDeviceType(chromeos::AudioDeviceType type) {
+  switch (type) {
+    case chromeos::AUDIO_TYPE_HEADPHONE:
+      return api::audio::DEVICE_TYPE_HEADPHONE;
+    case chromeos::AUDIO_TYPE_MIC:
+      return api::audio::DEVICE_TYPE_MIC;
+    case chromeos::AUDIO_TYPE_USB:
+      return api::audio::DEVICE_TYPE_USB;
+    case chromeos::AUDIO_TYPE_BLUETOOTH:
+      return api::audio::DEVICE_TYPE_BLUETOOTH;
+    case chromeos::AUDIO_TYPE_HDMI:
+      return api::audio::DEVICE_TYPE_HDMI;
+    case chromeos::AUDIO_TYPE_INTERNAL_SPEAKER:
+      return api::audio::DEVICE_TYPE_INTERNAL_SPEAKER;
+    case chromeos::AUDIO_TYPE_INTERNAL_MIC:
+      return api::audio::DEVICE_TYPE_INTERNAL_MIC;
+    case chromeos::AUDIO_TYPE_FRONT_MIC:
+      return api::audio::DEVICE_TYPE_FRONT_MIC;
+    case chromeos::AUDIO_TYPE_REAR_MIC:
+      return api::audio::DEVICE_TYPE_REAR_MIC;
+    case chromeos::AUDIO_TYPE_KEYBOARD_MIC:
+      return api::audio::DEVICE_TYPE_KEYBOARD_MIC;
+    case chromeos::AUDIO_TYPE_HOTWORD:
+      return api::audio::DEVICE_TYPE_HOTWORD;
+    case chromeos::AUDIO_TYPE_LINEOUT:
+      return api::audio::DEVICE_TYPE_LINEOUT;
+    case chromeos::AUDIO_TYPE_POST_MIX_LOOPBACK:
+      return api::audio::DEVICE_TYPE_POST_MIX_LOOPBACK;
+    case chromeos::AUDIO_TYPE_POST_DSP_LOOPBACK:
+      return api::audio::DEVICE_TYPE_POST_DSP_LOOPBACK;
+    case chromeos::AUDIO_TYPE_OTHER:
+      return api::audio::DEVICE_TYPE_OTHER;
+  }

[Devlin, 2017/01/30 21:32:38]

nit: should there be a NOTREACHED() here?

[tbarzic, 2017/01/30 21:46:28]

yep, there probably should.

+  return api::audio::DEVICE_TYPE_OTHER;
+}
+
+}  // namespace
+
 class AudioServiceImpl : public AudioService,
                          public chromeos::CrasAudioHandler::AudioObserver {
  public:
   AudioServiceImpl();
   ~AudioServiceImpl() override;
 
   // Called by listeners to this service to add/remove themselves as observers.
   void AddObserver(AudioService::Observer* observer) override;
   void RemoveObserver(AudioService::Observer* observer) override;
 
@@ skipping 292 matching lines @@
   DeviceInfoList devices_info_list;
   chromeos::AudioDeviceList devices;
   cras_audio_handler_->GetAudioDevices(&devices);
   for (size_t i = 0; i < devices.size(); ++i) {
     AudioDeviceInfo info;
     info.id = base::Uint64ToString(devices[i].id);
     info.stream_type = devices[i].is_input
                            ? extensions::api::audio::STREAM_TYPE_INPUT
                            : extensions::api::audio::STREAM_TYPE_OUTPUT;
     info.is_input = devices[i].is_input;
-    info.device_type = chromeos::AudioDevice::GetTypeString(devices[i].type);
+    info.device_type = GetAsAudioApiDeviceType(devices[i].type);
     info.display_name = devices[i].display_name;
     info.device_name = devices[i].device_name;
     info.is_active = devices[i].active;
     info.is_muted =
         devices[i].is_input
             ? cras_audio_handler_->IsInputMutedForDevice(devices[i].id)
             : cras_audio_handler_->IsOutputMutedForDevice(devices[i].id);
     info.level =
         devices[i].is_input
             ? cras_audio_handler_->GetOutputVolumePercentForDevice(
@@ skipping 11 matching lines @@
   // Notify DeviceChanged event for backward compatibility.
   // TODO(jennyz): remove this code when the old version of hotrod retires.
   NotifyDeviceChanged();
 }
 
 AudioService* AudioService::CreateInstance() {
   return new AudioServiceImpl;
 }
 
 }  // namespace extensions