Cleanup template in CdmPromise

media/base/media_keys.h

 // Copyright 2013 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_MEDIA_KEYS_H_
 #define MEDIA_BASE_MEDIA_KEYS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "url/gurl.h"
 
 namespace media {
 
 class Decryptor;
-
-template <typename T>
-class CdmPromiseTemplate;
-
-typedef CdmPromiseTemplate<std::string> NewSessionCdmPromise;
-typedef CdmPromiseTemplate<void> SimpleCdmPromise;
-typedef std::vector<std::vector<uint8> > KeyIdsVector;
-typedef CdmPromiseTemplate<KeyIdsVector> KeyIdsPromise;
+class KeyIdsPromise;
+class NewSessionCdmPromise;
+class SimpleCdmPromise;
 
 // Performs media key operations.
 //
 // All key operations are called on the renderer thread. Therefore, these calls
 // should be fast and nonblocking; key events should be fired asynchronously.
 class MEDIA_EXPORT MediaKeys {
  public:
   // Reported to UMA, so never reuse a value!
   // Must be kept in sync with blink::WebMediaPlayerClient::MediaKeyErrorCode
   // (enforced in webmediaplayer_impl.cc).
@@ skipping 80 matching lines @@
 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB;
 
 typedef base::Callback<void(const std::string& web_session_id,
                             MediaKeys::Exception exception_code,
                             uint32 system_code,
                             const std::string& error_message)> SessionErrorCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_KEYS_H_