[EXPERIMENT] Revert "Route D3D VSync signal to Compositor"

gpu/ipc/service/image_transport_surface_win.cc

Index: gpu/ipc/service/image_transport_surface_win.cc
diff --git a/gpu/ipc/service/image_transport_surface_win.cc b/gpu/ipc/service/image_transport_surface_win.cc
index 600c7678cabc13da74688eb1b213c4aa2178555b..d4deb27391aa35935dc78e00b1a3ae5b25c008ed 100644
--- a/gpu/ipc/service/image_transport_surface_win.cc
+++ b/gpu/ipc/service/image_transport_surface_win.cc
@@ -6,32 +6,19 @@
 
 #include <memory>
 
-#include "base/win/windows_version.h"
 #include "gpu/ipc/service/child_window_surface_win.h"
 #include "gpu/ipc/service/direct_composition_surface_win.h"
-#include "gpu/ipc/service/gpu_vsync_provider_win.h"
 #include "gpu/ipc/service/pass_through_image_transport_surface.h"
 #include "gpu/ipc/service/switches.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
-#include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
 #include "ui/gl/vsync_provider_win.h"
 
 namespace gpu {
 
-namespace {
-bool IsGpuVSyncSignalSupported() {
-  // TODO(stanisc): http://crbug.com/467617 Limit to Windows 8+ for now because
-  // of locking issue caused by waiting for VSync on Win7.
-  return base::win::GetVersion() >= base::win::VERSION_WIN8 &&
-         base::FeatureList::IsEnabled(features::kD3DVsync);
-}
-
-}  // namespace
-
 // static
 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
     base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
@@ -41,12 +28,8 @@ scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
 
   scoped_refptr<gl::GLSurface> surface;
   if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2) {
-    std::unique_ptr<gfx::VSyncProvider> vsync_provider;
-
-    if (IsGpuVSyncSignalSupported())
-      vsync_provider.reset(new GpuVSyncProviderWin(delegate, surface_handle));
-    else
-      vsync_provider.reset(new gl::VSyncProviderWin(surface_handle));
+    std::unique_ptr<gfx::VSyncProvider> vsync_provider(
+        new gl::VSyncProviderWin(surface_handle));
 
     if (gl::GLSurfaceEGL::IsDirectCompositionSupported()) {
       if (DirectCompositionSurfaceWin::AreOverlaysSupported()) {