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

mandoline/services/core_services/BUILD.gn

 # 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.
 #
 # core_services should be thought of as a bundle of many of the services which
 # we ship with.
 
 import("//build/config/ui.gni")
 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 import("//testing/test.gni")
@@ skipping 42 matching lines @@
 
 source_set("sources") {
   sources = [
     "core_services_application_delegate.cc",
     "main.cc",
   ]
 
   deps = [
     "//base",
     "//components/clipboard:lib",
-    "//components/surfaces:lib",
     "//components/resource_provider:lib",
-    "//components/view_manager:view_manager_lib",
+    "//components/view_manager:lib",
+    "//components/view_manager/surfaces:lib",
     "//mandoline/ui/browser:kiosk_wm_lib",
     "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
     "//mojo/services/network:lib",
     "//mojo/services/tracing:lib",
   ]
 
   if (!is_android) {
     deps += [
       "//components/view_manager/public/cpp",
       "//mandoline/ui/omnibox:lib",
     ]
   }
 }