Move H264Parser and H264BitReader to media/filters.

media/filters/h264_bit_reader.h

Index: media/filters/h264_bit_reader.h
diff --git a/content/common/gpu/media/h264_bit_reader.h b/media/filters/h264_bit_reader.h
similarity index 87%
rename from content/common/gpu/media/h264_bit_reader.h
rename to media/filters/h264_bit_reader.h
index a2d32b5c9cc8f994f46f20f4f4aed93d9d4ffbbb..1042ed744cc78570d89478aa887fc1e4bc61f2ed 100644
--- a/content/common/gpu/media/h264_bit_reader.h
+++ b/media/filters/h264_bit_reader.h
@@ -4,21 +4,21 @@
 //
 // This file contains an implementation of an H264 Annex-B video stream parser.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_H264_BIT_READER_H_
-#define CONTENT_COMMON_GPU_MEDIA_H264_BIT_READER_H_
+#ifndef MEDIA_FILTERS_H264_BIT_READER_H_
+#define MEDIA_FILTERS_H264_BIT_READER_H_
 
 #include <sys/types.h>
 
 #include "base/basictypes.h"
-#include "content/common/content_export.h"
+#include "media/base/media_export.h"
 
-namespace content {
+namespace media {
 
 // A class to provide bit-granularity reading of H.264 streams.
 // This is not a generic bit reader class, as it takes into account
 // H.264 stream-specific constraints, such as skipping emulation-prevention
 // bytes and stop bits. See spec for more details.
-class CONTENT_EXPORT H264BitReader {
+class MEDIA_EXPORT H264BitReader {
  public:
   H264BitReader();
   ~H264BitReader();
@@ -35,7 +35,7 @@ class CONTENT_EXPORT H264BitReader {
   // |num_bits| may be 1-32, inclusive.
   // Return false if the given number of bits cannot be read (not enough
   // bits in the stream), true otherwise.
-  bool ReadBits(int num_bits, int *out);
+  bool ReadBits(int num_bits, int* out);
 
   // Return the number of bits left in the stream.
   off_t NumBitsLeft();
@@ -74,6 +74,6 @@ class CONTENT_EXPORT H264BitReader {
   DISALLOW_COPY_AND_ASSIGN(H264BitReader);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_H264_BIT_READER_H_
+#endif  // MEDIA_FILTERS_H264_BIT_READER_H_