Remove GetWindowList / GetScreenList and SelectWindow / SelectScreen from WebRTC

webrtc/modules/desktop_capture/window_capturer_unittest.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 25 matching lines @@
     frame_ = std::move(frame);
   }
 
  protected:
   std::unique_ptr<WindowCapturer> capturer_;
   std::unique_ptr<DesktopFrame> frame_;
 };
 
 // Verify that we can enumerate windows.
 TEST_F(WindowCapturerTest, Enumerate) {
-  WindowCapturer::WindowList windows;
-  EXPECT_TRUE(capturer_->GetWindowList(&windows));
+  DesktopCapturer::SourceList sources;
+  EXPECT_TRUE(capturer_->GetSourceList(&sources));
 
   // Verify that window titles are set.
-  for (WindowCapturer::WindowList::iterator it = windows.begin();
-       it != windows.end(); ++it) {
+  for (auto it = sources.begin(); it != sources.end(); ++it) {
     EXPECT_FALSE(it->title.empty());
   }
 }
 
 // Verify we can capture a window.
 //
 // TODO(sergeyu): Currently this test just looks at the windows that already
 // exist. Ideally it should create a test window and capture from it, but there
 // is no easy cross-platform way to create new windows (potentially we could
 // have a python script showing Tk dialog, but launching code will differ
 // between platforms).
 TEST_F(WindowCapturerTest, Capture) {
-  WindowCapturer::WindowList windows;
+  DesktopCapturer::SourceList sources;
   capturer_->Start(this);
-  EXPECT_TRUE(capturer_->GetWindowList(&windows));
+  EXPECT_TRUE(capturer_->GetSourceList(&sources));
 
   // Verify that we can select and capture each window.
-  for (WindowCapturer::WindowList::iterator it = windows.begin();
-       it != windows.end(); ++it) {
+  for (auto it = sources.begin(); it != sources.end(); ++it) {
     frame_.reset();
-    if (capturer_->SelectWindow(it->id)) {
+    if (capturer_->SelectSource(it->id)) {
       capturer_->CaptureFrame();
     }
 
     // If we failed to capture a window make sure it no longer exists.
     if (!frame_.get()) {
-      WindowCapturer::WindowList new_list;
-      EXPECT_TRUE(capturer_->GetWindowList(&new_list));
-      for (WindowCapturer::WindowList::iterator new_list_it = new_list.begin();
-           new_list_it != new_list.end(); ++new_list_it) {
+      DesktopCapturer::SourceList new_list;
+      EXPECT_TRUE(capturer_->GetSourceList(&new_list));
+      for (auto new_list_it = new_list.begin(); new_list_it != new_list.end();
+           ++new_list_it) {
         EXPECT_FALSE(it->id == new_list_it->id);
       }
       continue;
     }
 
     EXPECT_GT(frame_->size().width(), 0);
     EXPECT_GT(frame_->size().height(), 0);
   }
 }
 
 }  // namespace webrtc