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

webkit/media/crypto/proxy_decryptor.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 "webkit/media/crypto/proxy_decryptor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 225 matching lines @@
 
   decryptor_->Decrypt(encrypted, base::Bind(
       &ProxyDecryptor::OnBufferDecrypted, base::Unretained(this),
       message_loop_proxy, encrypted, decrypt_cb));
 }
 
 void ProxyDecryptor::OnBufferDecrypted(
     const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
     const scoped_refptr<media::DecoderBuffer>& encrypted,
     const media::Decryptor::DecryptCB& decrypt_cb,
-    media::Decryptor::DecryptStatus status,
+    media::Decryptor::Status status,
     const scoped_refptr<media::DecoderBuffer>& decrypted) {
   if (status == media::Decryptor::kSuccess ||
       status == media::Decryptor::kError) {
     decrypt_cb.Run(status, decrypted);
     return;
   }
 
   DCHECK_EQ(status, media::Decryptor::kNoKey);
   DVLOG(1) << "OnBufferDecrypted(): kNoKey fired";
   {
     base::AutoLock auto_lock(lock_);
     if (stopped_) {
       DVLOG(1) << "OnBufferDecrypted(): fire decrypt callbacks with kError.";
       decrypt_cb.Run(kError, NULL);
       return;
     }
     pending_decrypt_closures_.push_back(base::Bind(
         &ProxyDecryptor::DecryptOnMessageLoop, base::Unretained(this),
         message_loop_proxy, encrypted, decrypt_cb));
   }
   // TODO(xhwang): The same NeedKey may be fired multiple times here and also
   // in Decrypt(). While the spec says only one NeedKey should be fired. Leave
   // them as is since the spec about this may change.
   FireNeedKey(client_, encrypted);
 }
 
 }  // namespace webkit_media