Modify unit tests for NativeDesktopMediaList to cover aura window capture.

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 231 matching lines @@
                            std::move(screen_capturer),
                            std::move(window_capturer)));
 }
 
 NativeDesktopMediaList::~NativeDesktopMediaList() {
   capture_task_runner_->DeleteSoon(FROM_HERE, worker_.release());
 }
 
 void NativeDesktopMediaList::Refresh() {
 #if defined(USE_AURA)
-  pending_aura_capture_requests_ = 0;
+  DCHECK_EQ(pending_aura_capture_requests_, 0);
+  DCHECK(!pending_native_thumbnail_capture_);
   new_aura_thumbnail_hashes_.clear();
-  pending_native_thumbnail_capture_ = true;
 #endif
 
   capture_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Worker::Refresh, base::Unretained(worker_.get()),
                             view_dialog_id_.id));
 }
 
 void NativeDesktopMediaList::RefreshForAuraWindows(
     std::vector<SourceDescription> sources) {
 #if defined(USE_AURA)
+  // Associate aura id with native id.
   for (auto& source : sources) {
+    if (source.id.type != DesktopMediaID::TYPE_WINDOW)
+      continue;
+
     aura::Window* aura_window = NULL;
 #if defined(OS_WIN)
     aura_window = views::DesktopWindowTreeHostWin::GetContentWindowForHWND(
         reinterpret_cast<HWND>(source.id.id));
 #elif defined(USE_X11) && !defined(OS_CHROMEOS)
     aura_window =
         views::DesktopWindowTreeHostX11::GetContentWindowForXID(source.id.id);
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
-    // Associate aura id with native id.
     if (aura_window) {
       DesktopMediaID aura_id = DesktopMediaID::RegisterAuraWindow(
           DesktopMediaID::TYPE_WINDOW, aura_window);
       source.id.aura_id = aura_id.aura_id;
     }
   }
 #endif  // defined(USE_AURA)
 
   UpdateSourcesList(sources);
 
+  // OnAuraThumbnailCaptured() and UpdateNativeThumbnailsFinished() are
+  // guaranteed to be excuted after RefreshForAuraWindows() and
+  // CaptureAuraWindowThumbnail() in the browser UI thread.
+  // Therefore pending_aura_capture_requests_ will be set the number of aura
+  // windows to be captured and pending_native_thumbnail_capture_ will be set
+  // true if native thumbnail capture is needed before OnAuraThumbnailCaptured()
+  // or UpdateNativeThumbnailsFinished() are called.
   std::vector<DesktopMediaID> native_ids;
   for (const auto& source : sources) {
 #if defined(USE_AURA)
     if (source.id.aura_id > DesktopMediaID::kNullId) {
       CaptureAuraWindowThumbnail(source.id);
       continue;
     }
 #endif  // defined(USE_AURA)
     native_ids.push_back(source.id);
   }
 
-  capture_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&Worker::RefreshThumbnails, base::Unretained(worker_.get()),
-                 native_ids, thumbnail_size_));
+  if (native_ids.size() > 0) {
+#if defined(USE_AURA)
+    pending_native_thumbnail_capture_ = true;
+#endif
+    capture_task_runner_->PostTask(
+        FROM_HERE,
+        base::Bind(&Worker::RefreshThumbnails, base::Unretained(worker_.get()),
+                   native_ids, thumbnail_size_));
+  }
 }
 
 void NativeDesktopMediaList::UpdateNativeThumbnailsFinished() {
 #if defined(USE_AURA)
   DCHECK(pending_native_thumbnail_capture_);
   pending_native_thumbnail_capture_ = false;
   // Schedule next refresh if native thumbnail captures finished after aura
   // thumbnail captures.
   if (pending_aura_capture_requests_ == 0)
     ScheduleNextRefresh();
@@ skipping 38 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)