Initial pass at integrating Differ into the chromoting host code....

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/base/mock_objects.h"
 #include "remoting/host/mock_objects.h"
 #include "remoting/host/session_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 35 matching lines @@
   MessageLoop message_loop_;
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionManagerTest);
 };
 
 TEST_F(SessionManagerTest, Init) {
   Init();
 }
 
 ACTION_P2(RunCallback, rects, data) {
-  RectVector& dirty_rects = data->mutable_dirty_rects();
-  dirty_rects.insert(dirty_rects.end(), rects.begin(), rects.end());
+  InvalidRects& dirty_rects = data->mutable_dirty_rects();
+  InvalidRects temp_rects;
+  std::set_union(dirty_rects.begin(), dirty_rects.end(),
+                 rects.begin(), rects.end(),
+                 std::inserter(temp_rects, temp_rects.begin()));
+  dirty_rects.swap(temp_rects);
   arg0->Run(data);
   delete arg0;
 }
 
 ACTION_P(FinishEncode, msg) {
   Encoder::EncodingState state = (Encoder::EncodingStarting |
                                   Encoder::EncodingInProgress |
                                   Encoder::EncodingEnded);
   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;
 }
 
 TEST_F(SessionManagerTest, OneRecordCycle) {
   Init();
 
-  RectVector update_rects;
-  update_rects.push_back(gfx::Rect(0, 0, 10, 10));
+  InvalidRects update_rects;
+  update_rects.insert(gfx::Rect(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
   scoped_refptr<CaptureData> data(new CaptureData(planes, kWidth,
                                                   kHeight, kFormat));
   // Set the recording rate to very low to avoid capture twice.
   record_->SetMaxRate(0.01);
 
   // Add the mock client connection to the session.
   EXPECT_CALL(*capturer_, width()).WillRepeatedly(Return(kWidth));
   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.
   HostMessage* msg = new HostMessage();
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillOnce(FinishEncode(msg));
 
   // Expect the client be notified.
   EXPECT_CALL(*client_, SendBeginUpdateStreamMessage());
   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