Renamed Encoder -> VideoEncoder.

remoting/host/chromoting_host.cc

Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index d70085fb4cfeb11b6e2b79e014fb999753379b5c..9474196a37778adaf11f15a1312bc831078a35ba 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -223,7 +223,8 @@ void ChromotingHost::OnSessionChannelsConnected(ClientSession* client) {
 
   // Then we create a ScreenRecorder passing the message loops that
   // it should run on.
-  Encoder* encoder = CreateEncoder(client->connection()->session()->config());
+  VideoEncoder* encoder =

[simonmorris, 2012/08/24 16:19:29]

encoder -> video_encoder?

[kxing, 2012/08/24 16:28:04]

Done.

+      CreateEncoder(client->connection()->session()->config());
 
   recorder_ = new ScreenRecorder(context_->capture_task_runner(),
                                  context_->encode_task_runner(),
@@ -421,15 +422,16 @@ void ChromotingHost::SetUiStrings(const UiStrings& ui_strings) {
 
 // TODO(sergeyu): Move this to SessionManager?
 // static
-Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig& config) {
+VideoEncoder* ChromotingHost::CreateEncoder(
+    const protocol::SessionConfig& config) {
   const protocol::ChannelConfig& video_config = config.video_config();
 
   if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
-    return EncoderRowBased::CreateVerbatimEncoder();
+    return VideoEncoderRowBased::CreateVerbatimEncoder();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) {
-    return EncoderRowBased::CreateZlibEncoder();
+    return VideoEncoderRowBased::CreateZlibEncoder();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
-    return new remoting::EncoderVp8();
+    return new remoting::VideoEncoderVp8();
   }
 
   return NULL;