Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 2 insertions, 52 deletions

diff --git a/chrome/common/gpu_video_common.cc b/chrome/common/gpu_video_common.cc
index 556e385..67466b9 100644
--- a/chrome/common/gpu_video_common.cc
+++ b/chrome/common/gpu_video_common.cc
@@ -4,59 +4,9 @@
 
 #include "chrome/common/gpu_video_common.h"
 
-namespace IPC {
-
-void ParamTraits<GpuVideoServiceInfoParam>::Write(
-    Message* m, const GpuVideoServiceInfoParam& p) {
-  WriteParam(m, p.video_service_route_id);
-  WriteParam(m, p.video_service_host_route_id);
-  WriteParam(m, p.service_available);
-}
-
-bool ParamTraits<GpuVideoServiceInfoParam>::Read(
-    const Message* m, void** iter, GpuVideoServiceInfoParam* r) {
-  if (!ReadParam(m, iter, &r->video_service_route_id) ||
-      !ReadParam(m, iter, &r->video_service_host_route_id) ||
-      !ReadParam(m, iter, &r->service_available))
-    return false;
-  return true;
-}
+const int32 kGpuVideoInvalidFrameId = -1;
 
-void ParamTraits<GpuVideoServiceInfoParam>::Log(
-    const GpuVideoServiceInfoParam& p, std::string* l) {
-  l->append(StringPrintf("(%d, %d, %d)",
-            p.video_service_route_id,
-            p.video_service_host_route_id,
-            p.service_available));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void ParamTraits<GpuVideoDecoderInfoParam>::Write(
-    Message* m, const GpuVideoDecoderInfoParam& p) {
-  WriteParam(m, p.context_id);
-  WriteParam(m, p.decoder_id);
-  WriteParam(m, p.decoder_route_id);
-  WriteParam(m, p.decoder_host_route_id);
-}
-
-bool ParamTraits<GpuVideoDecoderInfoParam>::Read(
-    const Message* m, void** iter, GpuVideoDecoderInfoParam* r) {
-  if (!ReadParam(m, iter, &r->context_id) ||
-      !ReadParam(m, iter, &r->decoder_id) ||
-      !ReadParam(m, iter, &r->decoder_route_id) ||
-      !ReadParam(m, iter, &r->decoder_host_route_id))
-    return false;
-  return true;
-}
-
-void ParamTraits<GpuVideoDecoderInfoParam>::Log(
-    const GpuVideoDecoderInfoParam& p, std::string* l) {
-  l->append(StringPrintf("(%d, %d, %d)",
-            p.decoder_id,
-            p.decoder_route_id,
-            p.decoder_host_route_id));
-}
+namespace IPC {
 
 ///////////////////////////////////////////////////////////////////////////////