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

remoting/base/decoder_verbatim.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/decoder_verbatim.h"
 
 #include "remoting/base/protocol_util.h"
 
 namespace remoting {
 
@@ skipping 20 matching lines @@
   partial_decode_done_.reset(partial_decode_done);
   decode_done_.reset(decode_done);
   updated_rects_ = updated_rects;
 
   // TODO(hclam): Check if we can accept the color format of the video frame
   // and the codec.
   frame_ = frame;
   return true;
 }
 
-bool DecoderVerbatim::PartialDecode(ChromotingHostMessage* message) {
-  scoped_ptr<ChromotingHostMessage> msg_deleter(message);
+bool DecoderVerbatim::PartialDecode(HostMessage* message) {
+  scoped_ptr<HostMessage> msg_deleter(message);
   DCHECK(message->has_update_stream_packet());
 
   bool ret = true;
   if (message->update_stream_packet().has_begin_rect())
     ret = HandleBeginRect(message);
   if (ret && message->update_stream_packet().has_rect_data())
     ret = HandleRectData(message);
   if (ret && message->update_stream_packet().has_end_rect())
     ret = HandleEndRect(message);
   return ret;
 }
 
 void DecoderVerbatim::EndDecode() {
   DCHECK_EQ(kWaitingForBeginRect, state_);
   decode_done_->Run();
 
   partial_decode_done_.reset();
   decode_done_.reset();
   frame_ = NULL;
   updated_rects_ = NULL;
 }
 
-bool DecoderVerbatim::HandleBeginRect(ChromotingHostMessage* message) {
+bool DecoderVerbatim::HandleBeginRect(HostMessage* message) {
   DCHECK_EQ(kWaitingForBeginRect, state_);
   state_ = kWaitingForRectData;
 
   rect_width_ = message->update_stream_packet().begin_rect().width();
   rect_height_ = message->update_stream_packet().begin_rect().height();
   rect_x_ = message->update_stream_packet().begin_rect().x();
   rect_y_ = message->update_stream_packet().begin_rect().y();
 
   PixelFormat pixel_format =
       message->update_stream_packet().begin_rect().pixel_format();
 
   if (static_cast<PixelFormat>(frame_->format()) != pixel_format) {
     NOTREACHED() << "Pixel format of message doesn't match the video frame. "
                     "Expected vs received = "
                  << frame_->format() << " vs " << pixel_format
                  << " Color space conversion required.";
     return false;
   }
 
   bytes_per_pixel_ = GetBytesPerPixel(pixel_format);
   return true;
 }
 
-bool DecoderVerbatim::HandleRectData(ChromotingHostMessage* message) {
+bool DecoderVerbatim::HandleRectData(HostMessage* message) {
   DCHECK_EQ(kWaitingForRectData, state_);
   DCHECK_EQ(0,
             message->update_stream_packet().rect_data().sequence_number());
 
   // Copy the data line by line.
   const int src_stride = bytes_per_pixel_ * rect_width_;
   const char* src =
       message->update_stream_packet().rect_data().data().c_str();
   int src_stride_dir = src_stride;
   if (reverse_rows_) {
@@ skipping 11 matching lines @@
     src += src_stride_dir;
   }
 
   updated_rects_->clear();
   updated_rects_->push_back(gfx::Rect(rect_x_, rect_y_,
                                       rect_width_, rect_height_));
   partial_decode_done_->Run();
   return true;
 }
 
-bool DecoderVerbatim::HandleEndRect(ChromotingHostMessage* message) {
+bool DecoderVerbatim::HandleEndRect(HostMessage* message) {
   DCHECK_EQ(kWaitingForRectData, state_);
   state_ = kWaitingForBeginRect;
   return true;
 }
 
 }  // namespace remoting