Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / codecs / opus / opus_speed_test.cc

diff --git a/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc b/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
index e2439cf..afbaee3 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
+++ b/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
@@ -12,8 +12,6 @@
 #include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
 
 using ::std::string;
-using ::std::tr1::make_tuple;
-using ::testing::ValuesIn;
 
 namespace webrtc {
 
@@ -105,14 +103,17 @@ ADD_TEST(0);
 
 // List all test cases: (channel, bit rat, filename, extension).
 const coding_param param_set[] =
-    {make_tuple(1, 64000, string("audio_coding/speech_mono_32_48kHz"),
-                string("pcm"), true),
-     make_tuple(1, 32000, string("audio_coding/speech_mono_32_48kHz"),
-                string("pcm"), true),
-     make_tuple(2, 64000, string("audio_coding/music_stereo_48kHz"),
-                string("pcm"), true)};
+    {::std::tr1::make_tuple(1, 64000,
+                            string("audio_coding/speech_mono_32_48kHz"),
+                            string("pcm"), true),
+     ::std::tr1::make_tuple(1, 32000,
+                            string("audio_coding/speech_mono_32_48kHz"),
+                            string("pcm"), true),
+     ::std::tr1::make_tuple(2, 64000,
+                            string("audio_coding/music_stereo_48kHz"),
+                            string("pcm"), true)};
 
 INSTANTIATE_TEST_CASE_P(AllTest, OpusSpeedTest,
-                        ValuesIn(param_set));
+                        ::testing::ValuesIn(param_set));
 
 }  // namespace webrtc