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

webrtc/pc/channel_unittest.cc

Index: webrtc/pc/channel_unittest.cc
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 4605ad9a08ddb3d700b5eeb4d0e256ab1e2668c5..99cca88637a877f018c6f7be8c22ee09a42c8023 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -2195,7 +2195,13 @@ class VideoChannelDoubleThreadTest : public ChannelTest<VideoTraits> {
 };
 
 // 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());