| Index: media/gpu/ipc/service/media_service.cc
|
| diff --git a/content/common/gpu/media/media_service.cc b/media/gpu/ipc/service/media_service.cc
|
| similarity index 78%
|
| rename from content/common/gpu/media/media_service.cc
|
| rename to media/gpu/ipc/service/media_service.cc
|
| index b274589b8878491542385c92cb4d3fec3ed87e79..86580e2771d5d4b0da8f4ab7e84d2ed4f3985d0d 100644
|
| --- a/content/common/gpu/media/media_service.cc
|
| +++ b/media/gpu/ipc/service/media_service.cc
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/common/gpu/media/media_service.h"
|
| +#include "media/gpu/ipc/service/media_service.h"
|
|
|
| #include <utility>
|
|
|
| -#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
|
| -#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
|
| -#include "content/common/gpu/media/media_channel.h"
|
| #include "gpu/ipc/service/gpu_channel.h"
|
| #include "gpu/ipc/service/gpu_channel_manager.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/param_traits_macros.h"
|
| +#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
|
| +#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
|
| +#include "media/gpu/ipc/service/media_channel.h"
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| MediaService::MediaService(gpu::GpuChannelManager* channel_manager)
|
| : channel_manager_(channel_manager) {}
|
| @@ -37,4 +37,4 @@ void MediaService::DestroyAllChannels() {
|
| media_channels_.clear();
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|