media: Use native Decryptor enum types in media mojo interfaces

media/base/decryptor.h

 // 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.
 
 #ifndef MEDIA_BASE_DECRYPTOR_H_
 #define MEDIA_BASE_DECRYPTOR_H_
 
 #include <list>
 
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 class VideoFrame;
 
 // Decrypts (and decodes) encrypted buffer.
 //
 // All methods are called on the (video/audio) decoder thread. Decryptor
 // implementations must be thread safe when methods are called this way.
 // Depending on the implementation callbacks may be fired synchronously or
 // asynchronously.
 class MEDIA_EXPORT Decryptor {
  public:
-  // TODO(xhwang): Replace kError with kDecryptError and kDecodeError.
-  // TODO(xhwang): Replace kNeedMoreData with kNotEnoughData.
   enum Status {
     kSuccess,  // Decryption successfully completed. Decrypted buffer ready.
-    kNoKey,  // No key is available to decrypt.
+    kNoKey,    // No key is available to decrypt.
     kNeedMoreData,  // Decoder needs more data to produce a frame.
-    kError  // Key is available but an error occurred during decryption.
+    kError,         // Key is available but an error occurred during decryption.
+    STATUS_MAX = kError

[dcheng, 2016/10/14 21:36:42]

Nit: it's probably better to be consistent with naming styles in the enums?

[xhwang, 2016/10/14 21:40:09]

I am not sure. I think at certain point we want to convert all of them to
UPPER_CASE per chromium coding style.

[dcheng, 2016/10/14 22:01:12]

Shrug, I'm not an owner of this code. But usually, I think it's a bit easier
maintenance-wise to stay consistent with a file. If we want to convert
everything later, that's fine too - but then we can make that change globally at
the time.

[xhwang, 2016/10/14 22:39:54]

Agreed. I was updating this then my machine lost power. I am gonna CQ this now,
then update in a later CL.

   };
 
   // TODO(xhwang): Unify this with DemuxerStream::Type.
-  enum StreamType {
-    kAudio,
-    kVideo
-  };
+  enum StreamType { kAudio, kVideo, STREAM_TYPE_MAX = kVideo };
 
   Decryptor();
   virtual ~Decryptor();
 
   // Indicates that a new key has been added to the MediaKeys object associated
   // with the Decryptor.
   typedef base::Callback<void()> NewKeyCB;
 
   // Registers a NewKeyCB which should be called when a new key is added to the
   // decryptor. Only one NewKeyCB can be registered for one |stream_type|.
@@ skipping 104 matching lines @@
   // The decoder can be reinitialized after it is uninitialized.
   virtual void DeinitializeDecoder(StreamType stream_type) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Decryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECRYPTOR_H_