media: Use native DemuxerStream enum types in media mojo interfaces

media/base/decryptor.h

Index: media/base/decryptor.h
diff --git a/media/base/decryptor.h b/media/base/decryptor.h
index 4f69ec7b96be38f73497c62b6a868d55b864c08f..58c92e6a9c9c598fd76b4a8e9612f8226d4a2f31 100644
--- a/media/base/decryptor.h
+++ b/media/base/decryptor.h
@@ -33,11 +33,11 @@ class MEDIA_EXPORT Decryptor {
     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.
-    STATUS_MAX = kError
+    kStatusMax = kError
   };
 
   // TODO(xhwang): Unify this with DemuxerStream::Type.
-  enum StreamType { kAudio, kVideo, STREAM_TYPE_MAX = kVideo };
+  enum StreamType { kAudio, kVideo, kStreamTypeMax = kVideo };
 
   Decryptor();
   virtual ~Decryptor();