Move rtc_video_decoder* from media/filter/ to content/renderer/media/.

content/renderer/media/rtc_video_decoder.h

 // 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.
 
-#ifndef MEDIA_FILTERS_RTC_VIDEO_DECODER_H_
-#define MEDIA_FILTERS_RTC_VIDEO_DECODER_H_
+#ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
+#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/time.h"
 #include "media/base/filters.h"
 #include "media/base/video_frame.h"
 #include "media/filters/decoder_base.h"
 
 // TODO(ronghuawu) ExternalRenderer should be defined in WebRtc
 class ExternalRenderer {
  public:
   virtual int FrameSizeChange(unsigned int width,
                               unsigned int height,
                               unsigned int number_of_streams) = 0;
   virtual int DeliverFrame(unsigned char* buffer, int buffer_size) = 0;
 
  protected:
   virtual ~ExternalRenderer() {}
 };
 
 namespace media {

[scherkus (not reviewing), 2011/06/17 00:31:46]

you're no longer inside media namespace

[Ronghua, 2011/06/24 21:08:51]

Done.

 
 class RTCVideoDecoder : public VideoDecoder,
                         public ExternalRenderer {
  public:
   RTCVideoDecoder(MessageLoop* message_loop, const std::string& url);
   virtual ~RTCVideoDecoder();
 
   // Filter implementation.
   virtual void Play(FilterCallback* callback);
   virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb);
@@ skipping 43 matching lines @@
   MediaFormat media_format_;
   std::deque<scoped_refptr<VideoFrame> > frame_queue_available_;
   // Used for accessing frame queue from another thread.
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
 };
 
 }  // namespace media
 
-#endif  // MEDIA_FILTERS_RTC_VIDEO_DECODER_H_
+#endif  // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_