Update audio api to use v2 stable device ID

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;
 
-uint64_t GetStableDeviceId(const chromeos::AudioDevice& device) {
-  // TODO(tbarzic): Update audio API to expose new stable device ID version.
-  // For now, for the sake of backward compatibility, use deprecated version.
-  // http://crbug.com/673392
-  if (device.stable_device_id_version == 1)
-    return device.stable_device_id;
-  if (device.stable_device_id_version == 2)
-    return device.deprecated_stable_device_id;
-  NOTREACHED() << "Unsupported stable audio devide id version.";
-  return 0;
-}
-
 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 265 matching lines @@
     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(
                   devices[i].id)
             : cras_audio_handler_->GetInputGainPercentForDevice(devices[i].id);
     info.stable_device_id.reset(
-        new std::string(base::Uint64ToString(GetStableDeviceId(devices[i]))));
+        new std::string(base::Uint64ToString(devices[i].stable_device_id)));
 
     devices_info_list.push_back(std::move(info));
   }
 
   for (auto& observer : observer_list_)
     observer.OnDevicesChanged(devices_info_list);
 
   // 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