Remove GetWindowList / GetScreenList and SelectWindow / SelectScreen from WebRTC

webrtc/modules/desktop_capture/win/screen_capture_utils.cc

 /*
  *  Copyright (c) 2014 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.
  */
 
 #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h"
 
-#include <assert.h>
 #include <windows.h>
 
+#include "webrtc/base/checks.h"
+
 namespace webrtc {
 
-bool GetScreenList(ScreenCapturer::ScreenList* screens) {
-  assert(screens->size() == 0);
+bool GetScreenList(DesktopCapturer::SourceList* screens) {
+  RTC_DCHECK(screens->size() == 0);
 
   BOOL enum_result = TRUE;
   for (int device_index = 0;; ++device_index) {
     DISPLAY_DEVICE device;
     device.cb = sizeof(device);
     enum_result = EnumDisplayDevices(NULL, device_index, &device, 0);
 
     // |enum_result| is 0 if we have enumerated all devices.
     if (!enum_result)
       break;
 
     // We only care about active displays.
     if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE))
       continue;
 
-    ScreenCapturer::Screen screen;
-    screen.id = device_index;
-    screens->push_back(screen);
+    screens->push_back({device_index, std::string()});
   }
   return true;
 }
 
-bool IsScreenValid(ScreenId screen, std::wstring* device_key) {
+bool IsScreenValid(DesktopCapturer::SourceId screen, std::wstring* device_key) {
   if (screen == kFullDesktopScreenId) {
     *device_key = L"";
     return true;
   }
 
   DISPLAY_DEVICE device;
   device.cb = sizeof(device);
   BOOL enum_result = EnumDisplayDevices(NULL, screen, &device, 0);
   if (enum_result)
     *device_key = device.DeviceKey;
 
   return !!enum_result;
 }
 
-DesktopRect GetScreenRect(ScreenId screen, const std::wstring& device_key) {
+DesktopRect GetScreenRect(DesktopCapturer::SourceId screen,
+                          const std::wstring& device_key) {
   if (screen == kFullDesktopScreenId) {
     return DesktopRect::MakeXYWH(GetSystemMetrics(SM_XVIRTUALSCREEN),
                                  GetSystemMetrics(SM_YVIRTUALSCREEN),
                                  GetSystemMetrics(SM_CXVIRTUALSCREEN),
                                  GetSystemMetrics(SM_CYVIRTUALSCREEN));
   }
 
   DISPLAY_DEVICE device;
   device.cb = sizeof(device);
   BOOL result = EnumDisplayDevices(NULL, screen, &device, 0);
@@ skipping 15 matching lines @@
   if (!result)
     return DesktopRect();
 
   return DesktopRect::MakeXYWH(device_mode.dmPosition.x,
                                device_mode.dmPosition.y,
                                device_mode.dmPelsWidth,
                                device_mode.dmPelsHeight);
 }
 
 }  // namespace webrtc