From 34a865a0385b6d5f79d177f16fa393cbbedcb844 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Sat, 16 Aug 2014 18:49:55 +0000 Subject: [PATCH] Roll chromium_revision 288251:289723 Mainly to pick up the libvpx.gyp change in r288724 to unblock https://webrtc-codereview.appspot.com/16229005/ Overview of changes in Chrome DEPS: $ svn diff http://src.chromium.org/chrome/trunk/src/DEPS -r 288251:289723 which can be compared with the output of: $ svn cat http://webrtc.googlecode.com/svn/trunk/DEPS | grep chromium_deps | sed 's/^ *//' | sort | uniq In a WebRTC checkout, that sums up to the following relevant changes: * src/buildtools 59b932:567f0a * testing/gtest 643:692 * testing/gmock 410:485 * third_party/boringssl/src 533cbe:c3d796 * third_party/libvpx 287125:289332 * third_party/libyuv 1035:1038 * third_party/nss 287121:289430 * third_party/opus/src 256783:289085 * tools/gyp 1959:1964 BUG=2863, chromium:339647 TEST=Local testing as trybots currently cannot handle DEPS changes properly due to http://crbug.com/385594 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22119004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6913 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- .../codecs/isac/fix/test/isac_speed_test.cc | 8 +++----- .../audio_coding/codecs/opus/opus_fec_test.cc | 16 +++++++--------- .../codecs/opus/opus_speed_test.cc | 19 ++++++++++--------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/DEPS b/DEPS index d25f46176..54150ae9c 100644 --- a/DEPS +++ b/DEPS @@ -13,7 +13,7 @@ vars = { "chromium_trunk" : "http://src.chromium.org/svn/trunk", # chrome://version/ for revision of canary Chrome. # http://chromium-status.appspot.com/lkgr is a last known good revision. - "chromium_revision": "288251", + "chromium_revision": "289723", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc b/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc index 4acb09ae1..358275111 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc @@ -13,8 +13,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 { @@ -101,10 +99,10 @@ TEST_P(IsacSpeedTest, IsacEncodeDecodeTest) { } const coding_param param_set[] = - {make_tuple(1, 32000, string("audio_coding/speech_mono_16kHz"), - string("pcm"), true)}; + {::std::tr1::make_tuple(1, 32000, string("audio_coding/speech_mono_16kHz"), + string("pcm"), true)}; INSTANTIATE_TEST_CASE_P(AllTest, IsacSpeedTest, - ValuesIn(param_set)); + ::testing::ValuesIn(param_set)); } // namespace webrtc diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc index ee027e809..57d834354 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc @@ -15,10 +15,8 @@ using ::std::string; using ::std::tr1::tuple; -using ::std::tr1::make_tuple; using ::std::tr1::get; using ::testing::TestWithParam; -using ::testing::ValuesIn; namespace webrtc { @@ -226,15 +224,15 @@ TEST_P(OpusFecTest, RandomPacketLossTest) { } const coding_param param_set[] = - {make_tuple(1, 64000, string("audio_coding/testfile32kHz"), - string("pcm")), - make_tuple(1, 32000, string("audio_coding/testfile32kHz"), - string("pcm")), - make_tuple(2, 64000, string("audio_coding/teststereo32kHz"), - string("pcm"))}; + {::std::tr1::make_tuple(1, 64000, string("audio_coding/testfile32kHz"), + string("pcm")), + ::std::tr1::make_tuple(1, 32000, string("audio_coding/testfile32kHz"), + string("pcm")), + ::std::tr1::make_tuple(2, 64000, string("audio_coding/teststereo32kHz"), + string("pcm"))}; // 64 kbps, stereo INSTANTIATE_TEST_CASE_P(AllTest, OpusFecTest, - ValuesIn(param_set)); + ::testing::ValuesIn(param_set)); } // namespace webrtc diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc b/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc index e2439cf5e..afbaee38e 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc +++ b/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