Merge ScreenCapturerWinDirectx::frames_ and contexts_

webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h

Index: webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h
index 82f8be3658c5e3b5e5aa9971c312e60e895cb2dc..59f457c5b4dcdd15ec6813983d1540f76b62efd5 100644
--- a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h
+++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h
@@ -19,10 +19,9 @@
 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"
-#include "webrtc/modules/desktop_capture/resolution_change_detector.h"
 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
-#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
 #include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
+#include "webrtc/modules/desktop_capture/win/dxgi_frame.h"
 
 namespace webrtc {
 
@@ -56,16 +55,10 @@ class ScreenCapturerWinDirectx : public DesktopCapturer {
   bool SelectSource(SourceId id) override;
 
  private:
-  // Returns desktop size of selected screen.
-  DesktopSize SelectedDesktopSize() const;
-
-  // TODO(zijiehe): Merge |frames_| and |contexts_| into a single object.
-  ScreenCaptureFrameQueue<SharedDesktopFrame> frames_;
-  ScreenCaptureFrameQueue<DxgiDuplicatorController::Context> contexts_;
+  ScreenCaptureFrameQueue<DxgiFrame> frames_;
   std::unique_ptr<SharedMemoryFactory> shared_memory_factory_;
   Callback* callback_ = nullptr;
   SourceId current_screen_id_ = kFullDesktopScreenId;
-  ResolutionChangeDetector resolution_change_detector_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinDirectx);
 };