Revert 57112 - Rename (Host|Client)Message to Chromoting(Host|Client)Message....

remoting/base/encoder_zlib.cc

 // Copyright (c) 2010 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.
 
 #include "remoting/base/encoder_zlib.h"
 
 #include "gfx/rect.h"
 #include "media/base/data_buffer.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/compressor_zlib.h"
@@ skipping 30 matching lines @@
   callback_.reset();
 }
 
 void EncoderZlib::EncodeRect(CompressorZlib* compressor,
                              const gfx::Rect& rect, size_t rect_index) {
   CHECK(capture_data_->data_planes().data[0]);
   const int strides = capture_data_->data_planes().strides[0];
   const int bytes_per_pixel = GetBytesPerPixel(capture_data_->pixel_format());
   const int row_size = bytes_per_pixel * rect.width();
 
-  ChromotingHostMessage* message = PrepareMessage(&rect);
+  HostMessage* message = PrepareMessage(&rect);
   const uint8 * in = capture_data_->data_planes().data[0] +
                      rect.y() * strides +
                      rect.x() * bytes_per_pixel;
   // TODO(hclam): Fill in the sequence number.
   uint8* out = (uint8*)message->mutable_update_stream_packet()->
       mutable_rect_data()->mutable_data()->data();
   int filled = 0;
   int row_x = 0;
   int row_y = 0;
   bool compress_again = true;
@@ skipping 38 matching lines @@
 
     // Reached the end of input row and we're not at the last row.
     if (row_x == row_size && row_y < rect.height() - 1) {
       row_x = 0;
       in += strides;
       ++row_y;
     }
   }
 }
 
-ChromotingHostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
-  ChromotingHostMessage* message = new ChromotingHostMessage();
+HostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
+  HostMessage* message = new HostMessage();
   UpdateStreamPacketMessage* packet = message->mutable_update_stream_packet();
 
   // Prepare the begin rect content.
   if (rect != NULL) {
     packet->mutable_begin_rect()->set_x(rect->x());
     packet->mutable_begin_rect()->set_y(rect->y());
     packet->mutable_begin_rect()->set_width(rect->width());
     packet->mutable_begin_rect()->set_height(rect->height());
     packet->mutable_begin_rect()->set_encoding(EncodingZlib);
     packet->mutable_begin_rect()->set_pixel_format(
         capture_data_->pixel_format());
   }
 
   packet->mutable_rect_data()->mutable_data()->resize(packet_size_);
   return message;
 }
 
-void EncoderZlib::SubmitMessage(ChromotingHostMessage* message,
-                                size_t rect_index) {
+void EncoderZlib::SubmitMessage(HostMessage* message, size_t rect_index) {
   EncodingState state = EncodingInProgress;
   if (rect_index == 0 && message->update_stream_packet().has_begin_rect())
     state |= EncodingStarting;
   if (rect_index == capture_data_->dirty_rects().size() - 1 &&
       message->update_stream_packet().has_end_rect())
     state |= EncodingEnded;
   callback_->Run(message, state);
 }
 
 }  // namespace remoting