Move GPU messages to content. I've also switched the IPC structs to use the ...

chrome/gpu/gpu_video_decoder.cc

 // Copyright (c) 2011 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 "chrome/gpu/gpu_video_decoder.h"
 
 #include "base/command_line.h"
-#include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_channel.h"
 #include "chrome/gpu/media/fake_gl_video_decode_engine.h"
 #include "chrome/gpu/media/fake_gl_video_device.h"
 #include "content/common/child_thread.h"
+#include "content/common/gpu_messages.h"
 #include "media/base/data_buffer.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_frame.h"
 
 #if defined(OS_WIN)
 #include "chrome/gpu/media/mft_angle_video_device.h"
 #include "media/video/mft_h264_decode_engine.h"
 #include <d3d9.h>
 #endif
 
@@ skipping 97 matching lines @@
 
 void GpuVideoDecoder::ProduceVideoSample(scoped_refptr<Buffer> buffer) {
   SendEmptyBufferDone();
 }
 
 void GpuVideoDecoder::ConsumeVideoFrame(scoped_refptr<VideoFrame> frame,
                                         const PipelineStatistics& statistics) {
   // TODO(sjl): Do something with the statistics...
 
   if (frame->IsEndOfStream()) {
-    SendConsumeVideoFrame(kGpuVideoInvalidFrameId, 0, 0, kGpuVideoEndOfStream);
+    SendConsumeVideoFrame(0, 0, 0, kGpuVideoEndOfStream);
     return;
   }
 
-  int32 frame_id = kGpuVideoInvalidFrameId;
+  int32 frame_id = -1;
   for (VideoFrameMap::iterator i = video_frame_map_.begin();
        i != video_frame_map_.end(); ++i) {
     if (i->second == frame) {
       frame_id = i->first;
       break;
     }
   }
-  DCHECK_NE(-1, frame_id) << "VideoFrame not recognized";
+
+  if (frame_id == -1) {
+    NOTREACHED() << "VideoFrame not recognized";
+    return;
+  }
 
   SendConsumeVideoFrame(frame_id, frame->GetTimestamp().InMicroseconds(),
                         frame->GetDuration().InMicroseconds(), 0);
 }
 
 void* GpuVideoDecoder::GetDevice() {
   bool ret = gles2_decoder_->MakeCurrent();
   DCHECK(ret) << "Failed to switch context";
 
   // Simply delegate the method call to GpuVideoDevice.
@@ skipping 261 matching lines @@
   }
 }
 
 void GpuVideoDecoder::SendReleaseAllVideoFrames() {
   if (!sender_->Send(
           new GpuVideoDecoderHostMsg_ReleaseAllVideoFrames(
               decoder_host_id()))) {
     LOG(ERROR) << "GpuVideoDecoderMsg_ReleaseAllVideoFrames failed";
   }
 }