Remove EMPTY from VideoFrame::Format.

media/filters/decrypting_video_decoder_unittest.cc

Index: media/filters/decrypting_video_decoder_unittest.cc
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index adf0585d140840f29170ead453b56b4bfb92dc64..7cf4f6085d00be8a10e2189be26a4abe3dcf47e9 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -55,8 +55,8 @@ ACTION_P2(ResetAndRunCallback, callback, param) {
   base::ResetAndReturn(callback).Run(param);
 }
 
-MATCHER(IsEndOfStream, "end of stream") {
-  return (arg->IsEndOfStream());
+MATCHER(end_of_stream, "end of stream") {

[scherkus (not reviewing), 2013/11/05 00:24:43]

this should still be IsEndOfStream()

(unix_hacker only applies to stuff like inlined getters/setters on classes)

[rileya (GONE FROM CHROMIUM), 2013/11/05 00:37:27]

Ahh, alrighty then, fixed.

+  return (arg->end_of_stream());
 }
 
 }  // namespace
@@ -74,7 +74,7 @@ class DecryptingVideoDecoderTest : public testing::Test {
         decoded_video_frame_(VideoFrame::CreateBlackFrame(
             TestVideoConfig::NormalCodedSize())),
         null_video_frame_(scoped_refptr<VideoFrame>()),
-        end_of_stream_video_frame_(VideoFrame::CreateEmptyFrame()) {
+        end_of_stream_video_frame_(VideoFrame::CreateEOSFrame()) {
     EXPECT_CALL(*this, RequestDecryptorNotification(_))
         .WillRepeatedly(RunCallbackIfNotNull(decryptor_.get()));
   }
@@ -109,8 +109,8 @@ class DecryptingVideoDecoderTest : public testing::Test {
       const scoped_refptr<VideoFrame>& video_frame) {
     if (status != VideoDecoder::kOk)
       EXPECT_CALL(*this, FrameReady(status, IsNull()));
-    else if (video_frame.get() && video_frame->IsEndOfStream())
-      EXPECT_CALL(*this, FrameReady(status, IsEndOfStream()));
+    else if (video_frame.get() && video_frame->end_of_stream())
+      EXPECT_CALL(*this, FrameReady(status, end_of_stream()));
     else
       EXPECT_CALL(*this, FrameReady(status, video_frame));