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

components/view_manager/surfaces/surfaces_service_application.h

 // Copyright 2014 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_SURFACES_SERVICE_APPLICATION_H_
-#define COMPONENTS_SURFACES_SURFACES_SERVICE_APPLICATION_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SURFACES_SURFACES_SERVICE_APPLICATION_H_
+#define COMPONENTS_VIEW_MANAGER_SURFACES_SURFACES_SERVICE_APPLICATION_H_
 
 #include <set>
 
 #include "base/macros.h"
 #include "cc/surfaces/surface_manager.h"
-#include "components/surfaces/public/interfaces/display.mojom.h"
-#include "components/surfaces/public/interfaces/surfaces.mojom.h"
+#include "components/view_manager/public/interfaces/display.mojom.h"
+#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/tracing_impl.h"
 
 namespace mojo {
 class ApplicationConnection;
 }
 
 namespace surfaces {
 class DisplayImpl;
@@ skipping 34 matching lines @@
   // Since these two classes have non-owning pointers to |manager_|, need to
   // destroy them if this class is destructed first.
   std::set<DisplayImpl*> displays_;
   std::set<SurfacesImpl*> surfaces_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication);
 };
 
 }  // namespace surfaces
 
-#endif  //  COMPONENTS_SURFACES_SURFACES_SERVICE_APPLICATION_H_
+#endif  //  COMPONENTS_VIEW_MANAGER_SURFACES_SURFACES_SERVICE_APPLICATION_H_