Move GLES2, GPU & Surfaces into the ViewManager directory. This does not merge the applications, th…

components/view_manager/surfaces/display_factory_impl.h

 // Copyright 2015 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 COMPONENTS_SURFACES_DISPLAY_FACTORY_IMPL_H_
-#define COMPONENTS_SURFACES_DISPLAY_FACTORY_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_FACTORY_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_FACTORY_IMPL_H_
 
-#include "components/surfaces/display_impl.h"
-#include "components/surfaces/public/interfaces/display.mojom.h"
+#include "components/view_manager/public/interfaces/display.mojom.h"
+#include "components/view_manager/surfaces/display_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace cc {
 class SurfaceManager;
 }
 
 namespace surfaces {
 class SurfacesScheduler;
 class SurfacesServiceApplication;
 
@@ skipping 17 matching lines @@
   uint32_t id_namespace_;
   uint32_t next_local_id_;
   SurfacesServiceApplication* application_;
   SurfacesScheduler* scheduler_;
   cc::SurfaceManager* manager_;
   mojo::StrongBinding<mojo::DisplayFactory> binding_;
 };
 
 }  // namespace surfaces
 
-#endif  // COMPONENTS_SURFACES_DISPLAY_FACTORY_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_FACTORY_IMPL_H_