Final cleanup pass over audio device API

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 95 matching lines @@
         audio_nodes);
     base::RunLoop().RunUntilIdle();
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
   chromeos::CrasAudioHandler* cras_audio_handler_;  // Not owned.
   chromeos::FakeCrasAudioClient* fake_cras_audio_client_;  // Not owned.
 };
 
-IN_PROC_BROWSER_TEST_F(AudioApiTest, AudioV1StableId) {
-  // Set up the audio nodes for testing.
-  AudioNodeList audio_nodes = {
-      CreateAudioNode(kJabraSpeaker1, 1), CreateAudioNode(kJabraSpeaker2, 1),
-      CreateAudioNode(kHDMIOutput, 1),    CreateAudioNode(kJabraMic1, 1),
-      CreateAudioNode(kJabraMic2, 1),     CreateAudioNode(kUSBCameraMic, 1)};
-
-  SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
-
-  EXPECT_TRUE(RunAppTest("api_test/audio")) << message_;
-}
-
-IN_PROC_BROWSER_TEST_F(AudioApiTest, AudioV2StableId) {
+IN_PROC_BROWSER_TEST_F(AudioApiTest, Audio) {
   // Set up the audio nodes for testing.
   AudioNodeList audio_nodes = {
       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_;
 }
@@ skipping 138 matching lines @@
   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