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

components/view_manager/surfaces/surfaces_impl.cc

 // 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.
 
-#include "components/surfaces/surfaces_impl.h"
+#include "components/view_manager/surfaces/surfaces_impl.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/surface_id_allocator.h"
-#include "components/surfaces/surfaces_scheduler.h"
-#include "components/surfaces/surfaces_service_application.h"
+#include "components/view_manager/surfaces/surfaces_scheduler.h"
+#include "components/view_manager/surfaces/surfaces_service_application.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 using mojo::SurfaceIdPtr;
 
 namespace surfaces {
 
 namespace {
 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
@@ skipping 53 matching lines @@
     ret[i] = mojo::ReturnedResource::From(resources[i]);
   }
   returner_->ReturnResources(ret.Pass());
 }
 
 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {
   return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 | local_id);
 }
 
 }  // namespace mojo