Update audio api to use v2 stable device ID

extensions/browser/api/audio/audio_apitest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
@@ skipping 57 matching lines @@
 const AudioNodeInfo kJabraMic2 = {
     true,        kJabraMic2Id, kJabraMic2StableDeviceId,
     "Jabra Mic", "USB",        "Jabra Mic 2"};
 
 const AudioNodeInfo kUSBCameraMic = {
     true,         kWebcamMicId, kWebcamMicStableDeviceId,
     "Webcam Mic", "USB",        "Logitech Webcam"};
 
 AudioNode CreateAudioNode(const AudioNodeInfo& info, int version) {
   return AudioNode(info.is_input, info.id, version == 2,
-                   // stable_device_id:
-                   info.stable_id ^ (version == 1 ? 0 : 0xFFFF),
-                   // stable_device_id_old:
-                   version == 1 ? 0 : info.stable_id, info.device_name,
+                   // 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);
 }
 
 class AudioApiTest : public ShellApiTest {
  public:
   AudioApiTest() : cras_audio_handler_(NULL), fake_cras_audio_client_(NULL) {}
   ~AudioApiTest() override {}
 
   void SetUpCrasAudioHandlerWithTestingNodes(const AudioNodeList& audio_nodes) {
     chromeos::DBusThreadManager* dbus_manager =
@@ skipping 39 matching lines @@
       CreateAudioNode(kJabraSpeaker1, 2), CreateAudioNode(kJabraSpeaker2, 2),
       CreateAudioNode(kHDMIOutput, 2),    CreateAudioNode(kJabraMic1, 2),
       CreateAudioNode(kJabraMic2, 2),     CreateAudioNode(kUSBCameraMic, 2)};
 
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   EXPECT_TRUE(RunAppTest("api_test/audio")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnLevelChangedOutputDevice) {
-  AudioNodeList audio_nodes = {CreateAudioNode(kJabraSpeaker1, 1),
-                               CreateAudioNode(kHDMIOutput, 1)};
+  AudioNodeList audio_nodes = {CreateAudioNode(kJabraSpeaker1, 2),
+                               CreateAudioNode(kHDMIOutput, 2)};
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   // Verify the jabra speaker is the active output device.
   AudioDevice device;
   EXPECT_TRUE(cras_audio_handler_->GetPrimaryActiveOutputDevice(&device));
   EXPECT_EQ(device.id, kJabraSpeaker1.id);
 
   // Loads background app.
   ResultCatcher result_catcher;
   ExtensionTestMessageListener load_listener("loaded", false);
   ASSERT_TRUE(LoadApp("api_test/audio/volume_change"));
   ASSERT_TRUE(load_listener.WaitUntilSatisfied());
 
   // Change output device volume.
   const int kVolume = 60;
   cras_audio_handler_->SetOutputVolumePercent(kVolume);
 
   // Verify the output volume is changed to the designated value.
   EXPECT_EQ(kVolume, cras_audio_handler_->GetOutputVolumePercent());
   EXPECT_EQ(kVolume,
             cras_audio_handler_->GetOutputVolumePercentForDevice(device.id));
 
   // Verify the background app got the OnOutputNodeVolumeChanged event
   // with the expected node id and volume value.
   ASSERT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnOutputMuteChanged) {
-  AudioNodeList audio_nodes = {CreateAudioNode(kJabraSpeaker1, 1),
-                               CreateAudioNode(kHDMIOutput, 1)};
+  AudioNodeList audio_nodes = {CreateAudioNode(kJabraSpeaker1, 2),
+                               CreateAudioNode(kHDMIOutput, 2)};
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   // Verify the jabra speaker is the active output device.
   AudioDevice device;
   EXPECT_TRUE(cras_audio_handler_->GetPrimaryActiveOutputDevice(&device));
   EXPECT_EQ(device.id, kJabraSpeaker1.id);
 
   // Mute the output.
   cras_audio_handler_->SetOutputMute(true);
   EXPECT_TRUE(cras_audio_handler_->IsOutputMuted());
 
   // Loads background app.
   ResultCatcher result_catcher;
   ExtensionTestMessageListener load_listener("loaded", false);
   ASSERT_TRUE(LoadApp("api_test/audio/output_mute_change"));
   ASSERT_TRUE(load_listener.WaitUntilSatisfied());
 
   // Un-mute the output.
   cras_audio_handler_->SetOutputMute(false);
   EXPECT_FALSE(cras_audio_handler_->IsOutputMuted());
 
   // Verify the background app got the OnMuteChanged event
   // with the expected output un-muted state.
   EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnInputMuteChanged) {
-  AudioNodeList audio_nodes = {CreateAudioNode(kJabraMic1, 1),
-                               CreateAudioNode(kUSBCameraMic, 1)};
+  AudioNodeList audio_nodes = {CreateAudioNode(kJabraMic1, 2),
+                               CreateAudioNode(kUSBCameraMic, 2)};
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   // Set the jabra mic to be the active input device.
-  AudioDevice jabra_mic(CreateAudioNode(kJabraMic1, 1));
+  AudioDevice jabra_mic(CreateAudioNode(kJabraMic1, 2));
   cras_audio_handler_->SwitchToDevice(
       jabra_mic, true, chromeos::CrasAudioHandler::ACTIVATE_BY_USER);
   EXPECT_EQ(kJabraMic1.id, cras_audio_handler_->GetPrimaryActiveInputNode());
 
   // Un-mute the input.
   cras_audio_handler_->SetInputMute(false);
   EXPECT_FALSE(cras_audio_handler_->IsInputMuted());
 
   // Loads background app.
   ResultCatcher result_catcher;
   ExtensionTestMessageListener load_listener("loaded", false);
   ASSERT_TRUE(LoadApp("api_test/audio/input_mute_change"));
   ASSERT_TRUE(load_listener.WaitUntilSatisfied());
 
   // Mute the input.
   cras_audio_handler_->SetInputMute(true);
   EXPECT_TRUE(cras_audio_handler_->IsInputMuted());
 
   // Verify the background app got the OnMuteChanged event
   // with the expected input muted state.
   EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnNodesChangedAddNodes) {
-  AudioNodeList audio_nodes = {CreateAudioNode(kJabraSpeaker1, 1),
-                               CreateAudioNode(kJabraSpeaker2, 1)};
+  AudioNodeList audio_nodes = {CreateAudioNode(kJabraSpeaker1, 2),
+                               CreateAudioNode(kJabraSpeaker2, 2)};
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
   const size_t init_device_size = audio_nodes.size();
 
   AudioDeviceList audio_devices;
   cras_audio_handler_->GetAudioDevices(&audio_devices);
   EXPECT_EQ(init_device_size, audio_devices.size());
 
   // Load background app.
   ResultCatcher result_catcher;
   ExtensionTestMessageListener load_listener("loaded", false);
   ASSERT_TRUE(LoadApp("api_test/audio/add_nodes"));
   ASSERT_TRUE(load_listener.WaitUntilSatisfied());
 
   // Plug in HDMI output.
-  audio_nodes.push_back(CreateAudioNode(kHDMIOutput, 1));
+  audio_nodes.push_back(CreateAudioNode(kHDMIOutput, 2));
   ChangeAudioNodes(audio_nodes);
   cras_audio_handler_->GetAudioDevices(&audio_devices);
   EXPECT_EQ(init_device_size + 1, audio_devices.size());
 
   // Verify the background app got the OnNodesChanged event
   // with the new node added.
   EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnNodesChangedRemoveNodes) {
-  AudioNodeList audio_nodes = {CreateAudioNode(kJabraMic1, 1),
-                               CreateAudioNode(kJabraMic2, 1),
-                               CreateAudioNode(kUSBCameraMic, 1)};
+  AudioNodeList audio_nodes = {CreateAudioNode(kJabraMic1, 2),
+                               CreateAudioNode(kJabraMic2, 2),
+                               CreateAudioNode(kUSBCameraMic, 2)};
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
   const size_t init_device_size = audio_nodes.size();
 
   AudioDeviceList audio_devices;
   cras_audio_handler_->GetAudioDevices(&audio_devices);
   EXPECT_EQ(init_device_size, audio_devices.size());
 
   // Load background app.
   ResultCatcher result_catcher;
   ExtensionTestMessageListener load_listener("loaded", false);
   ASSERT_TRUE(LoadApp("api_test/audio/remove_nodes"));
   ASSERT_TRUE(load_listener.WaitUntilSatisfied());
 
   // Remove camera mic.
   audio_nodes.erase(audio_nodes.begin() + init_device_size - 1);
   ChangeAudioNodes(audio_nodes);
   cras_audio_handler_->GetAudioDevices(&audio_devices);
   EXPECT_EQ(init_device_size - 1, audio_devices.size());
 
   // Verify the background app got the onNodesChanged event
   // with the last node removed.
   EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace extensions