Revert of Decouple Media Service

content/common/gpu/client/gpu_video_decode_accelerator_host.cc

 // Copyright (c) 2012 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.
 
 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
-#include "content/common/gpu/media/media_messages.h"
+#include "content/common/gpu/media_messages.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
 using media::VideoDecodeAccelerator;
 namespace content {
 
 GpuVideoDecodeAcceleratorHost::GpuVideoDecodeAcceleratorHost(
     GpuChannelHost* channel,
     CommandBufferProxyImpl* impl)
     : channel_(channel),
@@ skipping 247 matching lines @@
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Client::NotifyError() may Destroy() |this|, so calling it needs to be the
   // last thing done on this stack!
   media::VideoDecodeAccelerator::Client* client = NULL;
   std::swap(client, client_);
   client->NotifyError(static_cast<media::VideoDecodeAccelerator::Error>(error));
 }
 
 }  // namespace content