X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fwebrtc%2Fmodules%2Faudio_coding%2Fcodecs%2Fopus%2Fopus_speed_test.cc;h=afbaee38ee35903c2e19e064bd3a4019c1d6c0d5;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=e2439cf5ea4215b1d4030f24fee40beb90ac5303;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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