Change Deryptor::DecryptStatus and VideoDecoder::DecoderStatus to *::Status.

content/renderer/media/capture_video_decoder_unittest.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 "content/common/child_process.h"
 #include "content/renderer/media/capture_video_decoder.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/limits.h"
@@ skipping 141 matching lines @@
     buffer->height = size.height();
     int length = buffer->width * buffer->height * 3 / 2;
     buffer->memory_pointer = new uint8[length];
     buffer->buffer_size = length;
 
     EXPECT_CALL(*vc_impl_, FeedBuffer(_))
         .WillOnce(DeleteDataBuffer());
     decoder_->OnBufferReady(vc_impl_.get(), buffer);
   }
 
-  MOCK_METHOD2(FrameReady, void(media::VideoDecoder::DecoderStatus status,
+  MOCK_METHOD2(FrameReady, void(media::VideoDecoder::Status status,
                                 const scoped_refptr<media::VideoFrame>&));
 
   // Fixture members.
   scoped_refptr<CaptureVideoDecoder> decoder_;
   scoped_refptr<MockVideoCaptureImplManager> vc_manager_;
   scoped_ptr<ChildProcess> child_process_;
   scoped_ptr<MockVideoCaptureImpl> vc_impl_;
   media::MockStatisticsCB statistics_cb_object_;
   scoped_ptr<MessageLoop> message_loop_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
@@ skipping 46 matching lines @@
 
   EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
                                 HasSize(0, 0))).Times(2);
   decoder_->Read(read_cb_);
   decoder_->PrepareForShutdownHack();
   decoder_->Read(read_cb_);
   message_loop_->RunAllPending();
 
   Stop();
 }