Initial pass at integrating Differ into the chromoting host code.

BUG=none
TEST=run Win host; x11 client

Review URL: http://codereview.chromium.org/3013015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55297 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 6 deletions

diff --git a/remoting/host/session_manager_unittest.cc b/remoting/host/session_manager_unittest.cc
index 239eb97..29fa0f8 100644
--- a/remoting/host/session_manager_unittest.cc
+++ b/remoting/host/session_manager_unittest.cc
@@ -53,8 +53,12 @@ TEST_F(SessionManagerTest, 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;
 }
@@ -79,8 +83,8 @@ ACTION_P(AssignDirtyRect, 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);
@@ -98,7 +102,6 @@ TEST_F(SessionManagerTest, OneRecordCycle) {
   record_->AddClient(client_);
 
   // First the capturer is called.
-  EXPECT_CALL(*capturer_, InvalidateFullScreen());
   EXPECT_CALL(*capturer_, CaptureInvalidRects(NotNull()))
       .WillOnce(RunCallback(update_rects, data));
 
@@ -115,7 +118,6 @@ TEST_F(SessionManagerTest, OneRecordCycle) {
       .Times(AtLeast(0))
       .WillRepeatedly(Return(0));
 
-
   // Start the recording.
   record_->Start();