Revert of Modify ScreenCaptureFrameQueue into a template

webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_
 
 #include <memory>
 
 #include "webrtc/modules/desktop_capture/screen_capturer.h"
 
 #include <windows.h>
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
-#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
 #include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h"
 
 namespace webrtc {
 
 class Differ;
 
 // ScreenCapturerWinGdi captures 32bit RGB using GDI.
 //
 // ScreenCapturerWinGdi is double-buffered as required by ScreenCapturer.
 class ScreenCapturerWinGdi : public ScreenCapturer {
@@ skipping 31 matching lines @@
   // recently captured screen.
   ScreenCapturerHelper helper_;
 
   ScopedThreadDesktop desktop_;
 
   // GDI resources used for screen capture.
   HDC desktop_dc_;
   HDC memory_dc_;
 
   // Queue of the frames buffers.
-  ScreenCaptureFrameQueue<SharedDesktopFrame> queue_;
+  ScreenCaptureFrameQueue queue_;
 
   // Rectangle describing the bounds of the desktop device context, relative to
   // the primary display's top-left.
   DesktopRect desktop_dc_rect_;
 
   // Class to calculate the difference between two screen bitmaps.
   std::unique_ptr<Differ> differ_;
 
   HMODULE dwmapi_library_;
   DwmEnableCompositionFunc composition_func_;
 
   // Used to suppress duplicate logging of SetThreadExecutionState errors.
   bool set_thread_execution_state_failed_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinGdi);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_