Restructure public side of view_manager service.

services/window_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")
 
 mojo_native_application("window_manager") {
   sources = [
     "main.cc",
   ]
 
   public_deps = [
     ":lib",
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/common:tracing_impl",
-    "//mojo/services/public/cpp/view_manager",
+    "//mojo/services/view_manager/public/cpp",
   ]
 }
 
 source_set("lib") {
   sources = [
     "basic_focus_rules.cc",
     "basic_focus_rules.h",
     "focus_controller.cc",
     "focus_controller.h",
     "focus_controller_observer.h",
@@ skipping 18 matching lines @@
     "//ui/base",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//mojo/application",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/public/interfaces/application",
-    "//mojo/services/public/cpp/view_manager",
     "//mojo/services/public/interfaces/native_viewport",
+    "//mojo/services/view_manager/public/cpp",
     "//mojo/services/window_manager/public/interfaces",
   ]
 }
 
 test("window_manager_unittests") {
   sources = [
     "focus_controller_unittest.cc",
     "view_target_unittest.cc",
     "view_targeter_unittest.cc",
     "window_manager_api_unittest.cc",
     "window_manager_test_util.cc",
     "window_manager_test_util.h",
     "window_manager_unittests.cc",
   ]
 
   public_deps = [
     ":lib",
   ]
 
   deps = [
     "//base/test:test_support",
     "//mojo/application_manager",
     "//mojo/converters/geometry",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/application",
-    "//mojo/services/public/cpp/view_manager",
-    "//mojo/services/public/interfaces/view_manager",
+    "//mojo/services/view_manager/public/cpp",
+    "//mojo/services/view_manager/public/interfaces",
     "//mojo/services/window_manager/public/interfaces",
     "//shell:test_support",
     "//testing/gtest",
     "//ui/events:test_support",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gl",
   ]
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
 }