Use webrtc::DesktopCapturer for screen capturer implementation.

remoting/host/client_session.cc

 // Copyright (c) 2012 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/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "media/video/capture/screen/screen_capturer.h"
@@ skipping 81 matching lines @@
   DCHECK(!screen_controls_);
   DCHECK(!video_scheduler_);
 
   connection_.reset();
 }
 
 void ClientSession::NotifyClientResolution(
     const protocol::ClientResolution& resolution) {
   DCHECK(CalledOnValidThread());
 
-  if (!resolution.has_dips_width() || !resolution.has_dips_height())
+  // TODO(sergeyu): Move these checks to protocol layer.
+  if (!resolution.has_dips_width() || !resolution.has_dips_height() ||
+      resolution.dips_width() < 0 || resolution.dips_height() < 0 ||
+      resolution.width() <= 0 || resolution.height() <= 0) {
+    LOG(ERROR) << "Received invalid ClientResolution message.";
     return;
+  }
 
   VLOG(1) << "Received ClientResolution (dips_width="
           << resolution.dips_width() << ", dips_height="
           << resolution.dips_height() << ")";
 
   if (!screen_controls_)
     return;
 
   ScreenResolution client_resolution(
-      SkISize::Make(resolution.dips_width(), resolution.dips_height()),
-      SkIPoint::Make(kDefaultDPI, kDefaultDPI));
+      webrtc::DesktopSize(resolution.dips_width(), resolution.dips_height()),
+      webrtc::DesktopVector(kDefaultDPI, kDefaultDPI));
 
   // Try to match the client's resolution.
-  if (client_resolution.IsValid())
-    screen_controls_->SetScreenResolution(client_resolution);
+  screen_controls_->SetScreenResolution(client_resolution);
 }
 
 void ClientSession::ControlVideo(const protocol::VideoControl& video_control) {
   DCHECK(CalledOnValidThread());
 
   if (video_control.has_enable()) {
     VLOG(1) << "Received VideoControl (enable="
             << video_control.enable() << ")";
     video_scheduler_->Pause(!video_control.enable());
   }
@@ skipping 283 matching lines @@
     return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
     return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
   }
 
   NOTIMPLEMENTED();
   return scoped_ptr<AudioEncoder>(NULL);
 }
 
 }  // namespace remoting