Changing UpdateStreamPacket protobuf definition for chromoting

remoting/host/session_manager_unittest.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 "base/message_loop.h"
 #include "base/task.h"
 #include "remoting/host/mock_objects.h"
 #include "remoting/host/session_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 40 matching lines @@
   Init();
 }
 
 ACTION_P2(RunCallback, rects, data) {
   RectVector& dirty_rects = data->mutable_dirty_rects();
   dirty_rects.insert(dirty_rects.end(), rects.begin(), rects.end());
   arg0->Run(data);
   delete arg0;
 }
 
-ACTION_P3(FinishDecode, rects, buffer, header) {
-  gfx::Rect& rect = (*rects)[0];
+ACTION_P(FinishEncode, msg) {
   Encoder::EncodingState state = (Encoder::EncodingStarting |
                                   Encoder::EncodingInProgress |
                                   Encoder::EncodingEnded);
-  header->set_x(rect.x());
-  header->set_y(rect.y());
-  header->set_width(rect.width());
-  header->set_height(rect.height());
-  header->set_encoding(kEncoding);
-  header->set_pixel_format(kFormat);
-  arg2->Run(header, *buffer, state);
+  arg2->Run(msg, state);
 }
 
 ACTION_P(AssignCaptureData, data) {
   arg0[0] = data[0];
   arg0[1] = data[1];
   arg0[2] = data[2];
 }
 
 ACTION_P(AssignDirtyRect, rects) {
   *arg0 = *rects;
@@ skipping 21 matching lines @@
   EXPECT_CALL(*capturer_, height()).WillRepeatedly(Return(kHeight));
   EXPECT_CALL(*client_, SendInitClientMessage(kWidth, kHeight));
   record_->AddClient(client_);
 
   // First the capturer is called.
   EXPECT_CALL(*capturer_, InvalidateFullScreen());
   EXPECT_CALL(*capturer_, CaptureInvalidRects(NotNull()))
       .WillOnce(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
-  scoped_refptr<media::DataBuffer> buffer = new media::DataBuffer(0);
-  UpdateStreamPacketHeader *header = new UpdateStreamPacketHeader;
+  HostMessage* msg = new HostMessage();
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
-      .WillOnce(FinishDecode(&update_rects, &buffer, header));
+      .WillOnce(FinishEncode(msg));
 
   // Expect the client be notified.
   EXPECT_CALL(*client_, SendBeginUpdateStreamMessage());
-
-  EXPECT_CALL(*client_, SendUpdateStreamPacketMessage(header ,buffer));
+  EXPECT_CALL(*client_, SendUpdateStreamPacketMessage(_));
   EXPECT_CALL(*client_, SendEndUpdateStreamMessage());
   EXPECT_CALL(*client_, GetPendingUpdateStreamMessages())
       .Times(AtLeast(0))
       .WillRepeatedly(Return(0));
 
 
   // Start the recording.
   record_->Start();
 
   // Make sure all tasks are completed.
   message_loop_.RunAllPending();
 }
 
 // TODO(hclam): Add test for double buffering.
 // TODO(hclam): Add test for multiple captures.
 // TODO(hclam): Add test for interruption.
 
 }  // namespace remoting