Move //mojo/services/X/public/... to //mojo/services/X/... (part 3).

services/view_manager/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//mojo/public/mojo_application.gni")
 import("//testing/test.gni")
 
 mojo_native_application("view_manager") {
   sources = [
@@ skipping 69 matching lines @@
     "//mojo/application",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/interfaces/application",
     "//mojo/services/geometry/interfaces",
     "//mojo/services/input_events/interfaces",
     "//mojo/services/native_viewport/interfaces",
-    "//mojo/services/surfaces/public/cpp",
-    "//mojo/services/surfaces/public/interfaces",
+    "//mojo/services/surfaces/cpp",
+    "//mojo/services/surfaces/interfaces",
     "//mojo/services/view_manager/public/interfaces",
     "//mojo/services/view_manager/public/cpp:common",
     "//mojo/services/window_manager/public/interfaces",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 }
 
 source_set("test_support") {
   testonly = true
@@ skipping 85 matching lines @@
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/services/geometry/interfaces",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/interfaces",
     "//mojo/services/window_manager/public/interfaces",
   ]
 }