Revert of services/ui: Revert CLs that broke Windows.

services/ui/surfaces/display_compositor.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
-#include "services/ui/gles2/gpu_state.h"
 #include "services/ui/surfaces/surfaces_state.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class Display;
 }
 
 namespace ui {
 
 // TODO(fsamuel): This should become a mojo interface for the mus-gpu split.
 // TODO(fsamuel): This should not be a SurfaceFactoryClient.
 // The DisplayCompositor receives CompositorFrames from all sources,
 // creates a top-level CompositorFrame once per tick, and generates graphical
 // output.
 class DisplayCompositor : public cc::SurfaceFactoryClient,
                           public cc::DisplayClient {
  public:
   DisplayCompositor(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                     gfx::AcceleratedWidget widget,
-                    const scoped_refptr<GpuState>& gpu_state,
                     const scoped_refptr<SurfacesState>& surfaces_state);
   ~DisplayCompositor() override;
 
   // DisplayCompositor embedders submit a CompositorFrame when content on the
   // display should be changed. A well-behaving embedder should only submit
   // a CompositorFrame once per BeginFrame tick. The callback is called the
   // first time this frame is used to draw, or if the frame is discarded.
   void SubmitCompositorFrame(cc::CompositorFrame frame,
                              const base::Callback<void()>& callback);
 
@@ skipping 26 matching lines @@
   cc::SurfaceId surface_id_;
 
   gfx::Size display_size_;
   std::unique_ptr<cc::Display> display_;
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_