Use webrtc::DesktopCapturer for screen capturer implementation.

remoting/host/daemon_process.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/daemon_process.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 11 matching lines @@
 #include "remoting/protocol/transport.h"
 
 namespace remoting {
 
 namespace {
 
 // This is used for tagging system event logs.
 const char kApplicationName[] = "chromoting";
 
 std::ostream& operator<<(std::ostream& os, const ScreenResolution& resolution) {
-  return os << resolution.dimensions_.width() << "x"
-            << resolution.dimensions_.height() << " at "
-            << resolution.dpi_.x() << "x" << resolution.dpi_.y() << " DPI";
+  return os << resolution.dimensions().width() << "x"
+            << resolution.dimensions().height() << " at "
+            << resolution.dpi().x() << "x" << resolution.dpi().y() << " DPI";
 }
 
 }  // namespace
 
 DaemonProcess::~DaemonProcess() {
   DCHECK(!config_watcher_.get());
   DCHECK(desktop_sessions_.empty());
 }
 
 void DaemonProcess::OnConfigUpdated(const std::string& serialized_config) {
@@ skipping 136 matching lines @@
   // a protocol error and the network process will be restarted.
   if (WasTerminalIdAllocated(terminal_id)) {
     LOG(ERROR) << "Invalid terminal ID: " << terminal_id;
     CrashNetworkProcess(FROM_HERE);
     return;
   }
 
   // Terminal IDs cannot be reused. Update the expected next terminal ID.
   next_terminal_id_ = std::max(next_terminal_id_, terminal_id + 1);
 
-  // Validate |resolution| and restart the sender if it is not valid.
-  if (!resolution.IsValid()) {

[alexeypa (please no reviews), 2013/04/26 21:33:58]

|resolution| is received from less privileged process. We have to validate it
and crash the sender if it is bogus. I.e. don't delete this code.

Also this method (unlike DaemonProcess::SetScreenResolution) should allow screen
size 0x0. IsEmpty() from this CL will not allow this.

[Sergey Ulanov, 2013/05/07 22:25:50]

There is a check in chromoting_param_traits.cc where incoming messages are
parsed.

-    LOG(ERROR) << "Invalid resolution specified: " << resolution;
-    CrashNetworkProcess(FROM_HERE);
-    return;
-  }
-
   // Create the desktop session.
   scoped_ptr<DesktopSession> session = DoCreateDesktopSession(
       terminal_id, resolution, virtual_terminal);
   if (!session) {
     LOG(ERROR) << "Failed to create a desktop session.";
     SendToNetwork(
         new ChromotingDaemonNetworkMsg_TerminalDisconnected(terminal_id));
     return;
   }
 
   VLOG(1) << "Daemon: opened desktop session " << terminal_id;
   desktop_sessions_.push_back(session.release());
 }
 
 void DaemonProcess::SetScreenResolution(int terminal_id,
                                         const ScreenResolution& resolution) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   // Validate the supplied terminal ID. An attempt to use a desktop session ID
   // that couldn't possibly have been allocated is considered a protocol error
   // and the network process will be restarted.
   if (!WasTerminalIdAllocated(terminal_id)) {
     LOG(ERROR) << "Invalid terminal ID: " << terminal_id;
     CrashNetworkProcess(FROM_HERE);
     return;
   }
 
   // Validate |resolution| and restart the sender if it is not valid.
-  if (!resolution.IsValid()) {
+  if (resolution.IsEmpty()) {

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: IsEmpty() seems to be OK in this case since you changed it to check for
negative screen size. But 0x0 was legally allowed in some cases before. Be
careful when changing IsValid to IsEmpty.

[Sergey Ulanov, 2013/05/07 22:25:50]

Yes, I understand that there is a difference. Intention is that ScreenResolution
should never be initialized with invalid values - it DCHECKS for this in
constructor.

     LOG(ERROR) << "Invalid resolution specified: " << resolution;
     CrashNetworkProcess(FROM_HERE);
     return;
   }
 
   DesktopSessionList::iterator i;
   for (i = desktop_sessions_.begin(); i != desktop_sessions_.end(); ++i) {
     if ((*i)->id() == terminal_id) {
       break;
     }
@@ skipping 135 matching lines @@
 }
 
 void DaemonProcess::DeleteAllDesktopSessions() {
   while (!desktop_sessions_.empty()) {
     delete desktop_sessions_.front();
     desktop_sessions_.pop_front();
   }
 }
 
 }  // namespace remoting