| Index: media/base/decryptor_client.h
|
| diff --git a/media/crypto/decryptor_client.h b/media/base/decryptor_client.h
|
| similarity index 87%
|
| rename from media/crypto/decryptor_client.h
|
| rename to media/base/decryptor_client.h
|
| index c15a2f082f1bc097e594f4f1a16b4d192d787622..9db50cec662b06dd3675f5ac300cc17bb9896c45 100644
|
| --- a/media/crypto/decryptor_client.h
|
| +++ b/media/base/decryptor_client.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CRYPTO_DECRYPTOR_CLIENT_H_
|
| -#define MEDIA_CRYPTO_DECRYPTOR_CLIENT_H_
|
| +#ifndef MEDIA_BASE_DECRYPTOR_CLIENT_H_
|
| +#define MEDIA_BASE_DECRYPTOR_CLIENT_H_
|
|
|
| #include <string>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "media/crypto/aes_decryptor.h"
|
| +#include "media/base/decryptor.h"
|
|
|
| namespace media {
|
|
|
| @@ -24,7 +24,7 @@ class DecryptorClient {
|
| // system-dependent. For clear key system, the |system_code| is always zero.
|
| virtual void KeyError(const std::string& key_system,
|
| const std::string& session_id,
|
| - AesDecryptor::KeyError error_code,
|
| + Decryptor::KeyError error_code,
|
| int system_code) = 0;
|
|
|
| // Signals that a key message has been generated.
|
| @@ -47,4 +47,4 @@ class DecryptorClient {
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CRYPTO_DECRYPTOR_CLIENT_H_
|
| +#endif // MEDIA_BASE_DECRYPTOR_CLIENT_H_
|
|
|