Renamed Decoder -> VideoDecoder.

Review URL: https://chromiumcodereview.appspot.com/10873047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153140 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 5 deletions

diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc
index 16638ad..0fb253b 100644
--- a/remoting/client/rectangle_update_decoder.cc
+++ b/remoting/client/rectangle_update_decoder.cc
@@ -43,11 +43,11 @@ void RectangleUpdateDecoder::Initialize(const SessionConfig& config) {
   // Initialize decoder based on the selected codec.
   ChannelConfig::Codec codec = config.video_config().codec;
   if (codec == ChannelConfig::CODEC_VERBATIM) {
-    decoder_.reset(DecoderRowBased::CreateVerbatimDecoder());
+    decoder_.reset(VideoDecoderRowBased::CreateVerbatimDecoder());
   } else if (codec == ChannelConfig::CODEC_ZIP) {
-    decoder_.reset(DecoderRowBased::CreateZlibDecoder());
+    decoder_.reset(VideoDecoderRowBased::CreateZlibDecoder());
   } else if (codec == ChannelConfig::CODEC_VP8) {
-    decoder_.reset(new DecoderVp8());
+    decoder_.reset(new VideoDecoderVp8());
   } else {
     NOTREACHED() << "Invalid Encoding found: " << codec;
   }
@@ -101,7 +101,7 @@ void RectangleUpdateDecoder::DecodePacket(scoped_ptr<VideoPacket> packet,
     return;
   }
 
-  if (decoder_->DecodePacket(packet.get()) == Decoder::DECODE_DONE)
+  if (decoder_->DecodePacket(packet.get()) == VideoDecoder::DECODE_DONE)
     SchedulePaint();
 }
 
diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h
index afe0f28..3d61b97 100644
--- a/remoting/client/rectangle_update_decoder.h
+++ b/remoting/client/rectangle_update_decoder.h
@@ -70,7 +70,7 @@ class RectangleUpdateDecoder
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   scoped_refptr<FrameConsumerProxy> consumer_;
-  scoped_ptr<Decoder> decoder_;
+  scoped_ptr<VideoDecoder> decoder_;
 
   // Remote screen size in pixels.
   SkISize source_size_;