Roll libjingle+webrtc to r5397.

content/browser/renderer_host/media/desktop_capture_device.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/media/desktop_capture_device.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 352 matching lines @@
 
   scoped_ptr<webrtc::DesktopCapturer> capturer;
 
   switch (source.type) {
     case DesktopMediaID::TYPE_SCREEN: {
       scoped_ptr<webrtc::DesktopCapturer> screen_capturer;
       screen_capturer.reset(webrtc::ScreenCapturer::Create(options));
       if (screen_capturer) {
         capturer.reset(new webrtc::DesktopAndCursorComposer(
             screen_capturer.release(),
-            webrtc::MouseCursorMonitor::CreateForScreen(options)));
+            webrtc::MouseCursorMonitor::CreateForScreen(
+                options, webrtc::kFullDesktopScreenId)));
       }
       break;
     }
 
     case DesktopMediaID::TYPE_WINDOW: {
       scoped_ptr<webrtc::WindowCapturer> window_capturer(
           webrtc::WindowCapturer::Create(options));
       if (window_capturer && window_capturer->SelectWindow(source.id)) {
         capturer.reset(new webrtc::DesktopAndCursorComposer(
             window_capturer.release(),
@@ skipping 27 matching lines @@
     const media::VideoCaptureParams& params,
     scoped_ptr<Client> client) {
   core_->AllocateAndStart(params, client.Pass());
 }
 
 void DesktopCaptureDevice::StopAndDeAllocate() {
   core_->StopAndDeAllocate();
 }
 
 }  // namespace content