media: Fix mojo pipeline integration tests.

media/test/pipeline_integration_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
@@ skipping 17 matching lines @@
 #include "media/mojo/services/mojo_renderer_impl.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/application/public/cpp/connect.h"
 
 // TODO(dalecurtis): The mojo renderer is in another process, so we have no way
 // currently to get hashes for video and audio samples.  This also means that
 // real audio plays out for each test.
 #define EXPECT_HASH_EQ(a, b)
 #define EXPECT_VIDEO_FORMAT_EQ(a, b)
+#define EXPECT_COLOR_SPACE_EQ(a, b)
 
 // TODO(xhwang): EME support is not complete for the mojo renderer, so all
 // encrypted tests are currently disabled.
 #define DISABLE_EME_TESTS 1
 
 // TODO(xhwang,dalecurtis): Text tracks are not currently supported by the mojo
 // renderer.
 #define DISABLE_TEXT_TRACK_TESTS 1
 #else
 #define EXPECT_HASH_EQ(a, b) EXPECT_EQ(a, b)
 #define EXPECT_VIDEO_FORMAT_EQ(a, b) EXPECT_EQ(a, b)
+#define EXPECT_COLOR_SPACE_EQ(a, b) EXPECT_EQ(a, b)
 #endif
 
 using testing::_;
 using testing::AnyNumber;
 using testing::AtLeast;
 using testing::AtMost;
 using testing::SaveArg;
 
 namespace media {
 
@@ skipping 1596 matching lines @@
   EXPECT_VIDEO_FORMAT_EQ(last_video_frame_format_, VideoFrame::YV24);
 }
 
 // Verify that frames of VP9 video in the BT.709 color space have the YV12HD
 // format.
 TEST_F(PipelineIntegrationTest, BT709_VP9_WebM) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-vp9-bt709.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   EXPECT_VIDEO_FORMAT_EQ(last_video_frame_format_, VideoFrame::YV12);
-  EXPECT_EQ(last_video_frame_color_space_, VideoFrame::COLOR_SPACE_HD_REC709);
+  EXPECT_COLOR_SPACE_EQ(last_video_frame_color_space_,
+                        VideoFrame::COLOR_SPACE_HD_REC709);
 }
 
 // Verify that videos with an odd frame size playback successfully.
 TEST_F(PipelineIntegrationTest, BasicPlayback_OddVideoSize) {
   ASSERT_EQ(PIPELINE_OK, Start("butterfly-853x480.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
 // Verify that OPUS audio in a webm which reports a 44.1kHz sample rate plays
@@ skipping 64 matching lines @@
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media