Move H264Parser and H264BitReader to media/filters.

content/common/gpu/media/h264_dpb.h

 // 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.
 //
 // This file contains an implementation of an H.264 Decoded Picture Buffer
 // used in H264 decoders.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_
 #define CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
-#include "content/common/gpu/media/h264_parser.h"
+#include "media/filters/h264_parser.h"
 
 namespace content {
 
 // A picture (a frame or a field) in the H.264 spec sense.
 // See spec at http://www.itu.int/rec/T-REC-H.264
 struct H264Picture {
   enum Field {
     FIELD_NONE,
     FIELD_TOP,
     FIELD_BOTTOM,
@@ skipping 22 matching lines @@
   // Does memory management op 5 needs to be executed after this
   // picture has finished decoding?
   bool mem_mgmt_5;
 
   Field field;
 
   // Values from slice_hdr to be used during reference marking and
   // memory management after finishing this picture.
   bool long_term_reference_flag;
   bool adaptive_ref_pic_marking_mode_flag;
-  H264DecRefPicMarking ref_pic_marking[H264SliceHeader::kRefListSize];
+  media::H264DecRefPicMarking
+      ref_pic_marking[media::H264SliceHeader::kRefListSize];
 
   typedef std::vector<H264Picture*> PtrVector;
 };
 
 // DPB - Decoded Picture Buffer.
 // Stores decoded pictures that will be used for future display
 // and/or reference.
 class H264DPB {
  public:
   H264DPB();
@@ skipping 58 matching lines @@
  private:
   Pictures pics_;
   size_t max_num_pics_;
 
   DISALLOW_COPY_AND_ASSIGN(H264DPB);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_