| Index: media/cdm/ppapi/ppapi_cdm_adapter.h
|
| diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/ppapi_cdm_adapter.h
|
| similarity index 98%
|
| rename from media/cdm/ppapi/cdm_adapter.h
|
| rename to media/cdm/ppapi/ppapi_cdm_adapter.h
|
| index ac150e8e47c0396ef3cdbccfed3f85290b61688b..410cdb53e50a6afb1f1592d78dfb37bc862ebc7d 100644
|
| --- a/media/cdm/ppapi/cdm_adapter.h
|
| +++ b/media/cdm/ppapi/ppapi_cdm_adapter.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
|
| -#define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
|
| +#ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
|
| +#define MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -12,8 +12,8 @@
|
| #include "base/compiler_specific.h"
|
| #include "build/build_config.h"
|
| #include "media/cdm/api/content_decryption_module.h"
|
| +#include "media/cdm/cdm_wrapper.h"
|
| #include "media/cdm/ppapi/cdm_helpers.h"
|
| -#include "media/cdm/ppapi/cdm_wrapper.h"
|
| #include "media/cdm/ppapi/linked_ptr.h"
|
| #include "ppapi/c/pp_stdint.h"
|
| #include "ppapi/c/private/pp_content_decryptor.h"
|
| @@ -288,4 +288,4 @@ class CdmAdapter : public pp::Instance,
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
|
| +#endif // MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
|
|
|