Move output_mixer_unittest.cc to utility_unittest.cc.

This reflects a move of the tested code in:
https://webrtc-codereview.appspot.com/11019005/

TBR=xians

Review URL: https://webrtc-codereview.appspot.com/11449004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5866 4adac7df-926f-26a2-2b94-8c16560cd09d

2 files changed, 8 insertions, 8 deletions

diff --git a/voice_engine/output_mixer_unittest.cc b/voice_engine/utility_unittest.cc
index 08412d61..a5d0bcd8 100644
--- a/voice_engine/output_mixer_unittest.cc
+++ b/voice_engine/utility_unittest.cc
@@ -25,9 +25,9 @@ enum FunctionToTest {
   TestDownConvertToCodecFormat
 };
 
-class OutputMixerTest : public ::testing::Test {
+class UtilityTest : public ::testing::Test {
  protected:
-  OutputMixerTest() {
+  UtilityTest() {
     src_frame_.sample_rate_hz_ = 16000;
     src_frame_.samples_per_channel_ = src_frame_.sample_rate_hz_ / 100;
     src_frame_.num_channels_ = 1;
@@ -126,7 +126,7 @@ void VerifyFramesAreEqual(const AudioFrame& ref_frame,
   }
 }
 
-void OutputMixerTest::RunResampleTest(int src_channels,
+void UtilityTest::RunResampleTest(int src_channels,
                                       int src_sample_rate_hz,
                                       int dst_channels,
                                       int dst_sample_rate_hz,
@@ -190,7 +190,7 @@ void OutputMixerTest::RunResampleTest(int src_channels,
   }
 }
 
-TEST_F(OutputMixerTest, RemixAndResampleCopyFrameSucceeds) {
+TEST_F(UtilityTest, RemixAndResampleCopyFrameSucceeds) {
   // Stereo -> stereo.
   SetStereoFrame(&src_frame_, 10, 10);
   SetStereoFrame(&dst_frame_, 0, 0);
@@ -204,7 +204,7 @@ TEST_F(OutputMixerTest, RemixAndResampleCopyFrameSucceeds) {
   VerifyFramesAreEqual(src_frame_, dst_frame_);
 }
 
-TEST_F(OutputMixerTest, RemixAndResampleMixingOnlySucceeds) {
+TEST_F(UtilityTest, RemixAndResampleMixingOnlySucceeds) {
   // Stereo -> mono.
   SetStereoFrame(&dst_frame_, 0, 0);
   SetMonoFrame(&src_frame_, 10);
@@ -220,7 +220,7 @@ TEST_F(OutputMixerTest, RemixAndResampleMixingOnlySucceeds) {
   VerifyFramesAreEqual(golden_frame_, dst_frame_);
 }
 
-TEST_F(OutputMixerTest, RemixAndResampleSucceeds) {
+TEST_F(UtilityTest, RemixAndResampleSucceeds) {
   const int kSampleRates[] = {8000, 16000, 32000, 44100, 48000, 96000};
   const int kSampleRatesSize = sizeof(kSampleRates) / sizeof(*kSampleRates);
   const int kChannels[] = {1, 2};
@@ -238,7 +238,7 @@ TEST_F(OutputMixerTest, RemixAndResampleSucceeds) {
   }
 }
 
-TEST_F(OutputMixerTest, ConvertToCodecFormatSucceeds) {
+TEST_F(UtilityTest, ConvertToCodecFormatSucceeds) {
   const int kSampleRates[] = {8000, 16000, 32000, 44100, 48000, 96000};
   const int kSampleRatesSize = sizeof(kSampleRates) / sizeof(*kSampleRates);
   const int kChannels[] = {1, 2};
diff --git a/voice_engine/voice_engine.gyp b/voice_engine/voice_engine.gyp
index eae0ab89..16629d93 100644
--- a/voice_engine/voice_engine.gyp
+++ b/voice_engine/voice_engine.gyp
@@ -124,8 +124,8 @@
           ],
           'sources': [
             'channel_unittest.cc',
-            'output_mixer_unittest.cc',
             'transmit_mixer_unittest.cc',
+            'utility_unittest.cc',
             'voe_audio_processing_unittest.cc',
             'voe_base_unittest.cc',
             'voe_codec_unittest.cc',