Refactor audio API tests

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"
 #include "extensions/shell/test/shell_apitest.h"
+#include "extensions/test/extension_test_message_listener.h"
+#include "extensions/test/result_catcher.h"
+
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/audio_devices_pref_handler_stub.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cras_audio_client.h"
 #endif
-#include "extensions/test/extension_test_message_listener.h"
 
 namespace extensions {
 
 #if defined(OS_CHROMEOS)
 using chromeos::AudioDevice;
 using chromeos::AudioDeviceList;
 using chromeos::AudioNode;
 using chromeos::AudioNodeList;
 
 const uint64_t kJabraSpeaker1Id = 30001;
@@ skipping 113 matching lines @@
   audio_nodes.push_back(kJabraSpeaker1);
   audio_nodes.push_back(kHDMIOutput);
   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);
-  ExtensionTestMessageListener result_listener("success", false);
-  result_listener.set_failure_message("failure");
   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_listener.WaitUntilSatisfied());
-  EXPECT_EQ("success", result_listener.message());
+  ASSERT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnOutputMuteChanged) {
   AudioNodeList audio_nodes;
   audio_nodes.push_back(kJabraSpeaker1);
   audio_nodes.push_back(kHDMIOutput);
   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);
-  ExtensionTestMessageListener result_listener("success", false);
-  result_listener.set_failure_message("failure");
   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.
-  ASSERT_TRUE(result_listener.WaitUntilSatisfied());
-  EXPECT_EQ("success", result_listener.message());
+  EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnInputMuteChanged) {
   AudioNodeList audio_nodes;
   audio_nodes.push_back(kJabraMic1);
   audio_nodes.push_back(kUSBCameraMic);
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   // Set the jabra mic to be the active input device.
   AudioDevice jabra_mic(kJabraMic1);
   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);
-  ExtensionTestMessageListener result_listener("success", false);
-  result_listener.set_failure_message("failure");
   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.
-  ASSERT_TRUE(result_listener.WaitUntilSatisfied());
-  EXPECT_EQ("success", result_listener.message());
+  EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnNodesChangedAddNodes) {
   AudioNodeList audio_nodes;
   audio_nodes.push_back(kJabraSpeaker1);
   audio_nodes.push_back(kJabraSpeaker2);
   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);
-  ExtensionTestMessageListener result_listener("success", false);
-  result_listener.set_failure_message("failure");
   ASSERT_TRUE(LoadApp("api_test/audio/add_nodes"));
   ASSERT_TRUE(load_listener.WaitUntilSatisfied());
 
   // Plug in HDMI output.
   audio_nodes.push_back(kHDMIOutput);
   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.
-  ASSERT_TRUE(result_listener.WaitUntilSatisfied());
-  EXPECT_EQ("success", result_listener.message());
+  EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(AudioApiTest, OnNodesChangedRemoveNodes) {
   AudioNodeList audio_nodes;
   audio_nodes.push_back(kJabraMic1);
   audio_nodes.push_back(kJabraMic2);
   audio_nodes.push_back(kUSBCameraMic);
   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);
-  ExtensionTestMessageListener result_listener("success", false);
-  result_listener.set_failure_message("failure");
   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.
-  ASSERT_TRUE(result_listener.WaitUntilSatisfied());
-  EXPECT_EQ("success", result_listener.message());
+  EXPECT_TRUE(result_catcher.GetNextResult()) << result_catcher.message();
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace extensions