media: Use native DemuxerStream 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 15 matching lines @@
 // 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:
   enum Status {
     kSuccess,  // Decryption successfully completed. Decrypted buffer ready.
     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();
 
   // 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_