Update webrtc::DesktopCapturer clients to implement OnCaptureResult().

chrome/browser/media/native_desktop_media_list.cc

 // Copyright 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 "chrome/browser/media/native_desktop_media_list.h"
 
 #include "base/hash.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
@@ skipping 78 matching lines @@
 
   void Refresh(const DesktopMediaID::Id& view_dialog_id);
 
   void RefreshThumbnails(const std::vector<DesktopMediaID>& native_ids,
                          const gfx::Size& thumbnail_size);
 
  private:
   typedef std::map<DesktopMediaID, uint32_t> ImageHashesMap;
 
   // webrtc::DesktopCapturer::Callback interface.
-  void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
+  void OnCaptureResult(webrtc::DesktopCapturer::Result result,
+                       std::unique_ptr<webrtc::DesktopFrame> frame) override;
 
   base::WeakPtr<NativeDesktopMediaList> media_list_;
 
   std::unique_ptr<webrtc::ScreenCapturer> screen_capturer_;
   std::unique_ptr<webrtc::WindowCapturer> window_capturer_;
 
   std::unique_ptr<webrtc::DesktopFrame> current_frame_;
 
   ImageHashesMap image_hashes_;
 
@@ skipping 108 matching lines @@
   }
 
   image_hashes_.swap(new_image_hashes);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                  media_list_));
 }
 
-void NativeDesktopMediaList::Worker::OnCaptureCompleted(
-    webrtc::DesktopFrame* frame) {
-  current_frame_.reset(frame);
+void NativeDesktopMediaList::Worker::OnCaptureResult(
+    webrtc::DesktopCapturer::Result result,
+    std::unique_ptr<webrtc::DesktopFrame> frame) {
+  if (frame)
+    current_frame_ = std::move(frame);

[Wez, 2016/06/17 05:57:16]

You're changing the semantics such that the desktop-media list will show stale
content if a capture fails - is that desirable? Seems it really depends on why
the capture failed?

[Sergey Ulanov, 2016/06/17 14:59:54]

You are right. current_frame_ may actually be from a different window, so we
don't want to keep it here. Removed if.

 }
 
 NativeDesktopMediaList::NativeDesktopMediaList(
     std::unique_ptr<webrtc::ScreenCapturer> screen_capturer,
     std::unique_ptr<webrtc::WindowCapturer> window_capturer)
     : DesktopMediaListBase(
           base::TimeDelta::FromMilliseconds(kDefaultUpdatePeriod)),
       weak_factory_(this) {
   base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool();
   capture_task_runner_ = worker_pool->GetSequencedTaskRunner(
@@ skipping 124 matching lines @@
   if (pending_aura_capture_requests_ == 0) {
     previous_aura_thumbnail_hashes_ = std::move(new_aura_thumbnail_hashes_);
     // Schedule next refresh if aura thumbnail captures finished after native
     // thumbnail captures.
     if (!pending_native_thumbnail_capture_)
       ScheduleNextRefresh();
   }
 }
 
 #endif  // defined(USE_AURA)