| Index: media/base/ipc/media_param_traits.cc
|
| diff --git a/media/base/ipc/media_param_traits.cc b/media/base/ipc/media_param_traits.cc
|
| index c96e5f3fae9066be810656d30ce7132bb2dca6e3..e91012fecce74ac928dd62814f84b41de75d1dcc 100644
|
| --- a/media/base/ipc/media_param_traits.cc
|
| +++ b/media/base/ipc/media_param_traits.cc
|
| @@ -115,27 +115,27 @@ void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
|
| // Generate param traits size methods.
|
| #include "ipc/param_traits_size_macros.h"
|
| namespace IPC {
|
| -#undef MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_
|
| +#undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
|
| #include "media/base/ipc/media_param_traits_macros.h"
|
| }
|
|
|
| // Generate param traits write methods.
|
| #include "ipc/param_traits_write_macros.h"
|
| namespace IPC {
|
| -#undef MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_
|
| +#undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
|
| #include "media/base/ipc/media_param_traits_macros.h"
|
| } // namespace IPC
|
|
|
| // Generate param traits read methods.
|
| #include "ipc/param_traits_read_macros.h"
|
| namespace IPC {
|
| -#undef MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_
|
| +#undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
|
| #include "media/base/ipc/media_param_traits_macros.h"
|
| } // namespace IPC
|
|
|
| // Generate param traits log methods.
|
| #include "ipc/param_traits_log_macros.h"
|
| namespace IPC {
|
| -#undef MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_
|
| +#undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
|
| #include "media/base/ipc/media_param_traits_macros.h"
|
| } // namespace IPC
|
|
|