Revert of Decouple Media Service

content/common/gpu/client/gpu_video_encode_accelerator_host.cc

 // Copyright 2013 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_encode_accelerator_host.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/media/gpu_video_accelerator_util.h"
-#include "content/common/gpu/media/media_messages.h"
+#include "content/common/gpu/media_messages.h"
 #include "media/base/video_frame.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace content {
 
 GpuVideoEncodeAcceleratorHost::GpuVideoEncodeAcceleratorHost(
     GpuChannelHost* channel,
     CommandBufferProxyImpl* impl)
     : channel_(channel),
@@ skipping 63 matching lines @@
   DCHECK(CalledOnValidThread());
   client_ = client;
   if (!impl_) {
     DLOG(ERROR) << "impl_ destroyed";
     return false;
   }
 
   int32_t route_id = channel_->GenerateRouteID();
   channel_->AddRoute(route_id, weak_this_factory_.GetWeakPtr());
 
-  CreateVideoEncoderParams params;
-  params.command_buffer_route_id = impl_->route_id();
-  params.input_format = input_format;
-  params.input_visible_size = input_visible_size;
-  params.output_profile = output_profile;
-  params.initial_bitrate = initial_bitrate;
-  params.encoder_route_id = route_id;
   bool succeeded = false;
-  Send(new GpuCommandBufferMsg_CreateVideoEncoder(params, &succeeded));
+  Send(new GpuCommandBufferMsg_CreateVideoEncoder(
+      impl_->route_id(), input_format, input_visible_size, output_profile,
+      initial_bitrate, route_id, &succeeded));
   if (!succeeded) {
     DLOG(ERROR) << "Send(GpuCommandBufferMsg_CreateVideoEncoder()) failed";
     channel_->RemoveRoute(route_id);
     return false;
   }
   encoder_route_id_ = route_id;
   return true;
 }
 
 void GpuVideoEncodeAcceleratorHost::Encode(
@@ skipping 205 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::VideoEncodeAccelerator::Client* client = NULL;
   std::swap(client_, client);
   client->NotifyError(error);
 }
 
 }  // namespace content