Roll chromium_revision baaeb3f30e..ba3e8dd8fa (449272:449304)

webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm

Index: webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
diff --git a/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm b/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
index 5f8cacbc46f2cb0adc34992bf85350d019d3ab00..deae4e35059b4f9c71d7a529ce1ee3589181781c 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
@@ -219,7 +219,9 @@ TEST(AVFormatMapperTest, SetFormatWhenDeviceCannotLock) {
   EXPECT_FALSE(resultFormat);
 }
 
-TEST(AVFormatMapperTest, SetFormatWhenFormatIsIncompatible) {
+// Disabled due to failing with OCMock 3.1.5:
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=7137
+TEST(AVFormatMapperTest, DISABLED_SetFormatWhenFormatIsIncompatible) {
   // given
   id mockDevice = [OCMockObject mockForClass:[AVCaptureDevice class]];
   [[[mockDevice stub] andReturn:@[]] formats];