Roll chromium_revision 33a7a547b9..0e44c5e141 (452838:453130)

webrtc/pc/channel_unittest.cc

 /*
  *  Copyright 2009 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 2177 matching lines @@
 };
 
 class VideoChannelDoubleThreadTest : public ChannelTest<VideoTraits> {
  public:
   typedef ChannelTest<VideoTraits> Base;
   VideoChannelDoubleThreadTest()
       : Base(false, kH264Packet, kRtcpReport, NetworkIsWorker::No) {}
 };
 
 // VoiceChannelSingleThreadTest
-TEST_F(VoiceChannelSingleThreadTest, TestInit) {
+// Flaky on iOS Simualtor: bugs.webrtc.org/7247
+#if defined(WEBRTC_IOS)
+#define MAYBE_TestInit DISABLED_TestInit
+#else
+#define MAYBE_TestInit TestInit
+#endif
+TEST_F(VoiceChannelSingleThreadTest, MAYBE_TestInit) {
   Base::TestInit();
   EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
   EXPECT_TRUE(media_channel1_->dtmf_info_queue().empty());
 }
 
 TEST_F(VoiceChannelSingleThreadTest, TestDeinit) {
   Base::TestDeinit();
 }
 
 TEST_F(VoiceChannelSingleThreadTest, TestSetContents) {
@@ skipping 1570 matching lines @@
   ASSERT_TRUE(voice_channel_.Init_w(nullptr, nullptr, &fake_rtp_dtls_transport_,
                                     &fake_rtcp_dtls_transport_));
   EXPECT_DEATH(voice_channel_.SetTransports(&fake_rtp_dtls_transport_,
                                             &fake_rtp_dtls_transport_),
                "");
 }
 
 #endif  // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 // TODO(pthatcher): TestSetReceiver?