Revert of Add DesktopCapturerId and attach it to DesktopFrame

webrtc/modules/desktop_capture/desktop_capture_types.h

Index: webrtc/modules/desktop_capture/desktop_capture_types.h
diff --git a/webrtc/modules/desktop_capture/desktop_capture_types.h b/webrtc/modules/desktop_capture/desktop_capture_types.h
index 64a3fe4c4e79f1b423cc89e7c4a4dd39ae4dedcd..9a6162a766d5e7da2ce7db918dab0923a0a425f1 100644
--- a/webrtc/modules/desktop_capture/desktop_capture_types.h
+++ b/webrtc/modules/desktop_capture/desktop_capture_types.h
@@ -13,7 +13,6 @@
 
 #include <stdint.h>
 
-#include "webrtc/media/base/videocommon.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -37,14 +36,6 @@
 
 const ScreenId kInvalidScreenId = -2;
 
-// An integer to attach to each DesktopFrame to differentiate the generator of
-// the frame.
-namespace DesktopCapturerId {
-  constexpr uint32_t kUnknown = 0;
-  constexpr uint32_t kScreenCapturerWinGdi = FOURCC('G', 'D', 'I', ' ');
-  constexpr uint32_t kScreenCapturerWinDirectx = FOURCC('D', 'X', 'G', 'I');
-}  // namespace DesktopCapturerId
-
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_