Merge ScreenCapturerWinDirectx::frames_ and contexts_

webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h

Index: webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h
diff --git a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h b/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h
index a1ef0438c6b9991723f4f63b012efa68ace21731..4aee8b85b02c1263e1c8d5ac8d69911de22bae24 100644
--- a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h
+++ b/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h
@@ -16,9 +16,9 @@
 #include <vector>
 
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
-#include "webrtc/modules/desktop_capture/desktop_region.h"
 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
 #include "webrtc/modules/desktop_capture/win/d3d_device.h"
+#include "webrtc/modules/desktop_capture/win/dxgi_context.h"
 #include "webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h"
 
 namespace webrtc {
@@ -27,15 +27,7 @@ namespace webrtc {
 // single video card.
 class DxgiAdapterDuplicator {
  public:
-  struct Context {
-    Context();
-    Context(const Context& other);
-    ~Context();
-
-    // Child DxgiOutputDuplicator::Context belongs to this
-    // DxgiAdapterDuplicator::Context.
-    std::vector<DxgiOutputDuplicator::Context> contexts;
-  };
+  using Context = DxgiAdapterContext;
 
   // Creates an instance of DxgiAdapterDuplicator from a D3dDevice. Only
   // DxgiDuplicatorController can create an instance.