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

components/view_manager/surfaces/display_factory_impl.h

Index: components/view_manager/surfaces/display_factory_impl.h
diff --git a/components/surfaces/display_factory_impl.h b/components/view_manager/surfaces/display_factory_impl.h
similarity index 80%
rename from components/surfaces/display_factory_impl.h
rename to components/view_manager/surfaces/display_factory_impl.h
index 473f7b31674cd152c876711e71a7145fb3893b55..3312c26f0432caa524faa6fbb6cb2d2f49f6aebd 100644
--- a/components/surfaces/display_factory_impl.h
+++ b/components/view_manager/surfaces/display_factory_impl.h
@@ -2,11 +2,11 @@
 // 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 {
@@ -44,4 +44,4 @@ class DisplayFactoryImpl : public mojo::DisplayFactory {
 
 }  // namespace surfaces
 
-#endif  // COMPONENTS_SURFACES_DISPLAY_FACTORY_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_FACTORY_IMPL_H_