Moves mojo/services/* to components/* part 3

Moves view_manager

R=ben@chromium.org
TBR=ben@chromium.org
BUG=none
TEST=none

Review URL: https://codereview.chromium.org/1100603004

Cr-Commit-Position: refs/heads/master@{#325973}

67 files changed, 252 insertions, 248 deletions

diff --git a/mojo/services/kiosk_wm/BUILD.gn b/components/kiosk_wm/BUILD.gn
index 2e41546..2e41546 100644
--- a/mojo/services/kiosk_wm/BUILD.gn
+++ b/components/kiosk_wm/BUILD.gn
diff --git a/mojo/services/kiosk_wm/DEPS b/components/kiosk_wm/DEPS
index 0269410..f170cf7 100644
--- a/mojo/services/kiosk_wm/DEPS
+++ b/components/kiosk_wm/DEPS
@@ -1,6 +1,8 @@
 include_rules = [
-  "+mojo/application",
   "+components/window_manager",
+  "+mojo/application",
+  "+mojo/common",
+  "+third_party/mojo/src/mojo/public",
   "+third_party/mojo_services",
   "+ui",
 ]
diff --git a/mojo/services/kiosk_wm/README.md b/components/kiosk_wm/README.md
index 4c38010..4c38010 100644
--- a/mojo/services/kiosk_wm/README.md
+++ b/components/kiosk_wm/README.md
diff --git a/mojo/services/kiosk_wm/kiosk_wm.cc b/components/kiosk_wm/kiosk_wm.cc
index 392c52d..83331b7 100644
--- a/mojo/services/kiosk_wm/kiosk_wm.cc
+++ b/components/kiosk_wm/kiosk_wm.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/kiosk_wm/kiosk_wm.h"
+#include "components/kiosk_wm/kiosk_wm.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/kiosk_wm/merged_service_provider.h"
 #include "components/window_manager/basic_focus_rules.h"
-#include "mojo/services/kiosk_wm/merged_service_provider.h"
 
 namespace kiosk_wm {
 
diff --git a/mojo/services/kiosk_wm/kiosk_wm.h b/components/kiosk_wm/kiosk_wm.h
index f64c9df..2d3def0 100644
--- a/mojo/services/kiosk_wm/kiosk_wm.h
+++ b/components/kiosk_wm/kiosk_wm.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_KIOSK_WM_KIOSK_WM_H_
-#define SERVICES_KIOSK_WM_KIOSK_WM_H_
+#ifndef COMPONENTS_KIOSK_WM_KIOSK_WM_H_
+#define COMPONENTS_KIOSK_WM_KIOSK_WM_H_
 
 #include "base/memory/weak_ptr.h"
+#include "components/kiosk_wm/navigator_host_impl.h"
 #include "components/window_manager/window_manager_app.h"
 #include "components/window_manager/window_manager_delegate.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/connect.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/kiosk_wm/navigator_host_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
 #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"
@@ -92,4 +92,4 @@ class KioskWM : public mojo::ApplicationDelegate,
 
 }  // namespace kiosk_wm
 
-#endif  // SERVICES_KIOSK_WM_KIOSK_WM_H_
+#endif  // COMPONENTS_KIOSK_WM_KIOSK_WM_H_
diff --git a/mojo/services/kiosk_wm/main.cc b/components/kiosk_wm/main.cc
index fa60bf5..07c19db 100644
--- a/mojo/services/kiosk_wm/main.cc
+++ b/components/kiosk_wm/main.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/application/application_runner_chromium.h"
-#include "mojo/public/c/system/main.h"
+#include "components/kiosk_wm/kiosk_wm.h"
 
-#include "mojo/services/kiosk_wm/kiosk_wm.h"
+#include "mojo/application/application_runner_chromium.h"
+#include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new kiosk_wm::KioskWM);
diff --git a/mojo/services/kiosk_wm/merged_service_provider.cc b/components/kiosk_wm/merged_service_provider.cc
index 8987096..de2c21a 100644
--- a/mojo/services/kiosk_wm/merged_service_provider.cc
+++ b/components/kiosk_wm/merged_service_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/kiosk_wm/merged_service_provider.h"
+#include "components/kiosk_wm/merged_service_provider.h"
 
 namespace kiosk_wm {
 
diff --git a/mojo/services/kiosk_wm/merged_service_provider.h b/components/kiosk_wm/merged_service_provider.h
index 3b76138..1606ea8 100644
--- a/mojo/services/kiosk_wm/merged_service_provider.h
+++ b/components/kiosk_wm/merged_service_provider.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
-#define SERVICES_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
+#ifndef COMPONENTS_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
+#define COMPONENTS_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
 
 namespace kiosk_wm {
@@ -38,4 +38,4 @@ class MergedServiceProvider : public mojo::ServiceProvider {
 
 }  // namespace kiosk_wm
 
-#endif  // SERVICES_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
+#endif  // COMPONENTS_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
diff --git a/mojo/services/kiosk_wm/navigator_host_impl.cc b/components/kiosk_wm/navigator_host_impl.cc
index 3b28339..7c81310a 100644
--- a/mojo/services/kiosk_wm/navigator_host_impl.cc
+++ b/components/kiosk_wm/navigator_host_impl.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/kiosk_wm/navigator_host_impl.h"
+#include "components/kiosk_wm/navigator_host_impl.h"
 
-#include "mojo/services/kiosk_wm/kiosk_wm.h"
+#include "components/kiosk_wm/kiosk_wm.h"
 
 namespace kiosk_wm {
 
diff --git a/mojo/services/kiosk_wm/navigator_host_impl.h b/components/kiosk_wm/navigator_host_impl.h
index bf47a97..283d4ab 100644
--- a/mojo/services/kiosk_wm/navigator_host_impl.h
+++ b/components/kiosk_wm/navigator_host_impl.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
-#define SERVICES_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
+#ifndef COMPONENTS_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
+#define COMPONENTS_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "mojo/common/weak_binding_set.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"
 
 namespace kiosk_wm {
@@ -40,4 +40,4 @@ class NavigatorHostImpl : public mojo::NavigatorHost {
 
 }  // namespace kiosk_wm
 
-#endif  // SERVICES_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
+#endif  // COMPONENTS_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
diff --git a/mojo/services/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
index 04b3988..04b3988 100644
--- a/mojo/services/view_manager/BUILD.gn
+++ b/components/view_manager/BUILD.gn
diff --git a/mojo/services/view_manager/DEPS b/components/view_manager/DEPS
index 3612d0e..69acc37 100644
--- a/mojo/services/view_manager/DEPS
+++ b/components/view_manager/DEPS
@@ -1,7 +1,9 @@
 include_rules = [
   "+cc",
   "+mojo/application",
+  "+mojo/common",
   "+mojo/converters",
+  "+third_party/mojo/src/mojo/public",
   "+third_party/mojo_services",
   "+ui",
 ]
diff --git a/mojo/services/view_manager/access_policy.h b/components/view_manager/access_policy.h
index 6f22f91..eb5815b 100644
--- a/mojo/services/view_manager/access_policy.h
+++ b/components/view_manager/access_policy.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_ACCESS_POLICY_H_
-#define SERVICES_VIEW_MANAGER_ACCESS_POLICY_H_
+#ifndef COMPONENTS_VIEW_MANAGER_ACCESS_POLICY_H_
+#define COMPONENTS_VIEW_MANAGER_ACCESS_POLICY_H_
 
-#include "mojo/services/view_manager/ids.h"
+#include "components/view_manager/ids.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager_constants.mojom.h"
 
 namespace view_manager {
@@ -49,4 +49,4 @@ class AccessPolicy {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_ACCESS_POLICY_H_
+#endif  // COMPONENTS_VIEW_MANAGER_ACCESS_POLICY_H_
diff --git a/mojo/services/view_manager/access_policy_delegate.h b/components/view_manager/access_policy_delegate.h
index 1922176..0d9d105 100644
--- a/mojo/services/view_manager/access_policy_delegate.h
+++ b/components/view_manager/access_policy_delegate.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_ACCESS_POLICY_DELEGATE_H_
-#define SERVICES_VIEW_MANAGER_ACCESS_POLICY_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_ACCESS_POLICY_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_ACCESS_POLICY_DELEGATE_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
-#include "mojo/services/view_manager/ids.h"
+#include "components/view_manager/ids.h"
 
 namespace view_manager {
 
@@ -33,4 +33,4 @@ class AccessPolicyDelegate {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_ACCESS_POLICY_DELEGATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_ACCESS_POLICY_DELEGATE_H_
diff --git a/mojo/services/view_manager/animation_runner.cc b/components/view_manager/animation_runner.cc
index dc910a1..6569ff1 100644
--- a/mojo/services/view_manager/animation_runner.cc
+++ b/components/view_manager/animation_runner.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/animation_runner.h"
+#include "components/view_manager/animation_runner.h"
 
 #include "base/memory/scoped_vector.h"
-#include "mojo/services/view_manager/animation_runner_observer.h"
-#include "mojo/services/view_manager/scheduled_animation_group.h"
-#include "mojo/services/view_manager/server_view.h"
+#include "components/view_manager/animation_runner_observer.h"
+#include "components/view_manager/scheduled_animation_group.h"
+#include "components/view_manager/server_view.h"
 
 namespace view_manager {
 namespace {
diff --git a/mojo/services/view_manager/animation_runner.h b/components/view_manager/animation_runner.h
index 64bf494..02f9f2c 100644
--- a/mojo/services/view_manager/animation_runner.h
+++ b/components/view_manager/animation_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_H_
-#define SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_ANIMATION_RUNNER_H_
+#define COMPONENTS_VIEW_MANAGER_ANIMATION_RUNNER_H_
 
 #include <algorithm>
 #include <map>
@@ -111,4 +111,4 @@ class AnimationRunner {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_ANIMATION_RUNNER_H_
diff --git a/mojo/services/view_manager/animation_runner_observer.h b/components/view_manager/animation_runner_observer.h
index 9b79983..aa99d4c 100644
--- a/mojo/services/view_manager/animation_runner_observer.h
+++ b/components/view_manager/animation_runner_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_OBSERVER_H_
-#define SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_OBSERVER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_ANIMATION_RUNNER_OBSERVER_H_
+#define COMPONENTS_VIEW_MANAGER_ANIMATION_RUNNER_OBSERVER_H_
 
 namespace view_manager {
 
@@ -20,4 +20,4 @@ class AnimationRunnerObserver {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_OBSERVER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_ANIMATION_RUNNER_OBSERVER_H_
diff --git a/mojo/services/view_manager/animation_runner_unittest.cc b/components/view_manager/animation_runner_unittest.cc
index c43f0b1..6de5686 100644
--- a/mojo/services/view_manager/animation_runner_unittest.cc
+++ b/components/view_manager/animation_runner_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/animation_runner.h"
+#include "components/view_manager/animation_runner.h"
 
 #include "base/strings/stringprintf.h"
+#include "components/view_manager/animation_runner_observer.h"
+#include "components/view_manager/scheduled_animation_group.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/test_server_view_delegate.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/transform/transform_type_converters.h"
-#include "mojo/services/view_manager/animation_runner_observer.h"
-#include "mojo/services/view_manager/scheduled_animation_group.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/test_server_view_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager_constants.mojom.h"
 
diff --git a/mojo/services/view_manager/client_connection.cc b/components/view_manager/client_connection.cc
index 41c2c59..62aae04 100644
--- a/mojo/services/view_manager/client_connection.cc
+++ b/components/view_manager/client_connection.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/client_connection.h"
+#include "components/view_manager/client_connection.h"
 
-#include "mojo/services/view_manager/connection_manager.h"
-#include "mojo/services/view_manager/view_manager_service_impl.h"
+#include "components/view_manager/connection_manager.h"
+#include "components/view_manager/view_manager_service_impl.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/client_connection.h b/components/view_manager/client_connection.h
index 83fa864..2589204 100644
--- a/mojo/services/view_manager/client_connection.h
+++ b/components/view_manager/client_connection.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_CLIENT_CONNECTION_H_
-#define SERVICES_VIEW_MANAGER_CLIENT_CONNECTION_H_
+#ifndef COMPONENTS_VIEW_MANAGER_CLIENT_CONNECTION_H_
+#define COMPONENTS_VIEW_MANAGER_CLIENT_CONNECTION_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/error_handler.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 
 namespace view_manager {
@@ -59,4 +59,4 @@ class DefaultClientConnection : public ClientConnection,
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_CLIENT_CONNECTION_H_
+#endif  // COMPONENTS_VIEW_MANAGER_CLIENT_CONNECTION_H_
diff --git a/mojo/services/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc
index ee5ed7d..a7e1f5f 100644
--- a/mojo/services/view_manager/connection_manager.cc
+++ b/components/view_manager/connection_manager.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/connection_manager.h"
+#include "components/view_manager/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "components/view_manager/client_connection.h"
+#include "components/view_manager/connection_manager_delegate.h"
+#include "components/view_manager/display_manager.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/view_coordinate_conversions.h"
+#include "components/view_manager/view_manager_service_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/view_manager/client_connection.h"
-#include "mojo/services/view_manager/connection_manager_delegate.h"
-#include "mojo/services/view_manager/display_manager.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/view_coordinate_conversions.h"
-#include "mojo/services/view_manager/view_manager_service_impl.h"
+#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 
 using mojo::ConnectionSpecificId;
 
diff --git a/mojo/services/view_manager/connection_manager.h b/components/view_manager/connection_manager.h
index 7c6695a..e7b3347 100644
--- a/mojo/services/view_manager/connection_manager.h
+++ b/components/view_manager/connection_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
-#define SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
+#define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
@@ -11,11 +11,11 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
-#include "mojo/public/cpp/bindings/array.h"
-#include "mojo/services/view_manager/animation_runner.h"
-#include "mojo/services/view_manager/ids.h"
-#include "mojo/services/view_manager/server_view_delegate.h"
-#include "mojo/services/view_manager/server_view_observer.h"
+#include "components/view_manager/animation_runner.h"
+#include "components/view_manager/ids.h"
+#include "components/view_manager/server_view_delegate.h"
+#include "components/view_manager/server_view_observer.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager_internal.mojom.h"
 
@@ -249,4 +249,4 @@ class ConnectionManager : public ServerViewDelegate,
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
diff --git a/mojo/services/view_manager/connection_manager_delegate.h b/components/view_manager/connection_manager_delegate.h
index 3184c4a..0d06f94 100644
--- a/mojo/services/view_manager/connection_manager_delegate.h
+++ b/components/view_manager/connection_manager_delegate.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_DELEGATE_H_
-#define SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_DELEGATE_H_
 
 #include <string>
 
-#include "mojo/public/cpp/bindings/interface_request.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 
@@ -48,4 +48,4 @@ class ConnectionManagerDelegate {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_DELEGATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_DELEGATE_H_
diff --git a/mojo/services/view_manager/default_access_policy.cc b/components/view_manager/default_access_policy.cc
index 64da06d..ed0a6b6 100644
--- a/mojo/services/view_manager/default_access_policy.cc
+++ b/components/view_manager/default_access_policy.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/default_access_policy.h"
+#include "components/view_manager/default_access_policy.h"
 
-#include "mojo/services/view_manager/access_policy_delegate.h"
-#include "mojo/services/view_manager/server_view.h"
+#include "components/view_manager/access_policy_delegate.h"
+#include "components/view_manager/server_view.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/default_access_policy.h b/components/view_manager/default_access_policy.h
index 92ab4f8..5c23118 100644
--- a/mojo/services/view_manager/default_access_policy.h
+++ b/components/view_manager/default_access_policy.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 SERVICES_VIEW_MANAGER_DEFAULT_ACCESS_POLICY_H_
-#define SERVICES_VIEW_MANAGER_DEFAULT_ACCESS_POLICY_H_
+#ifndef COMPONENTS_VIEW_MANAGER_DEFAULT_ACCESS_POLICY_H_
+#define COMPONENTS_VIEW_MANAGER_DEFAULT_ACCESS_POLICY_H_
 
 #include "base/basictypes.h"
-#include "mojo/services/view_manager/access_policy.h"
+#include "components/view_manager/access_policy.h"
 
 namespace view_manager {
 
@@ -50,4 +50,4 @@ class DefaultAccessPolicy : public AccessPolicy {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_DEFAULT_ACCESS_POLICY_H_
+#endif  // COMPONENTS_VIEW_MANAGER_DEFAULT_ACCESS_POLICY_H_
diff --git a/mojo/services/view_manager/display_manager.cc b/components/view_manager/display_manager.cc
index 48422cf..52825ed 100644
--- a/mojo/services/view_manager/display_manager.cc
+++ b/components/view_manager/display_manager.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/display_manager.h"
+#include "components/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
+#include "components/view_manager/connection_manager.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/view_coordinate_conversions.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/transform/transform_type_converters.h"
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/view_manager/connection_manager.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/view_coordinate_conversions.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo_services/src/gpu/public/interfaces/gpu.mojom.h"
 #include "third_party/mojo_services/src/surfaces/public/cpp/surfaces_utils.h"
 #include "third_party/mojo_services/src/surfaces/public/interfaces/quads.mojom.h"
diff --git a/mojo/services/view_manager/display_manager.h b/components/view_manager/display_manager.h
index 41f1978..92026eb 100644
--- a/mojo/services/view_manager/display_manager.h
+++ b/components/view_manager/display_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
-#define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_DISPLAY_MANAGER_H_
+#define COMPONENTS_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
-#include "mojo/public/cpp/bindings/callback.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
 #include "third_party/mojo_services/src/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "third_party/mojo_services/src/surfaces/public/interfaces/display.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
@@ -93,4 +93,4 @@ class DefaultDisplayManager : public DisplayManager,
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_DISPLAY_MANAGER_H_
diff --git a/mojo/services/view_manager/focus_controller.cc b/components/view_manager/focus_controller.cc
index 3e363ee..84ee559 100644
--- a/mojo/services/view_manager/focus_controller.cc
+++ b/components/view_manager/focus_controller.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/focus_controller.h"
+#include "components/view_manager/focus_controller.h"
 
-#include "mojo/services/view_manager/focus_controller_delegate.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/server_view_drawn_tracker.h"
+#include "components/view_manager/focus_controller_delegate.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/server_view_drawn_tracker.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/focus_controller.h b/components/view_manager/focus_controller.h
index 3bdd060..1ad5fe5 100644
--- a/mojo/services/view_manager/focus_controller.h
+++ b/components/view_manager/focus_controller.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 SERVICES_VIEW_MANAGER_FOCUS_CONTROLLER_H_
-#define SERVICES_VIEW_MANAGER_FOCUS_CONTROLLER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_FOCUS_CONTROLLER_H_
+#define COMPONENTS_VIEW_MANAGER_FOCUS_CONTROLLER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/services/view_manager/server_view_drawn_tracker_observer.h"
+#include "components/view_manager/server_view_drawn_tracker_observer.h"
 
 namespace view_manager {
 
@@ -50,4 +50,4 @@ class FocusController : public ServerViewDrawnTrackerObserver {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_FOCUS_CONTROLLER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_FOCUS_CONTROLLER_H_
diff --git a/mojo/services/view_manager/focus_controller_delegate.h b/components/view_manager/focus_controller_delegate.h
index 6a91a67..ac2eeab 100644
--- a/mojo/services/view_manager/focus_controller_delegate.h
+++ b/components/view_manager/focus_controller_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_FOCUS_CONTROLLER_DELEGATE_H_
-#define SERVICES_VIEW_MANAGER_FOCUS_CONTROLLER_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_FOCUS_CONTROLLER_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_FOCUS_CONTROLLER_DELEGATE_H_
 
 namespace view_manager {
 
@@ -20,4 +20,4 @@ class FocusControllerDelegate {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_FOCUS_CONTROLLER_DELEGATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_FOCUS_CONTROLLER_DELEGATE_H_
diff --git a/mojo/services/view_manager/focus_controller_unittest.cc b/components/view_manager/focus_controller_unittest.cc
index c25694c..95ea9c9 100644
--- a/mojo/services/view_manager/focus_controller_unittest.cc
+++ b/components/view_manager/focus_controller_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/focus_controller.h"
+#include "components/view_manager/focus_controller.h"
 
-#include "mojo/services/view_manager/focus_controller_delegate.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/test_server_view_delegate.h"
+#include "components/view_manager/focus_controller_delegate.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/test_server_view_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace view_manager {
diff --git a/mojo/services/view_manager/gesture_manager.cc b/components/view_manager/gesture_manager.cc
index 1b312bd..399ee33 100644
--- a/mojo/services/view_manager/gesture_manager.cc
+++ b/components/view_manager/gesture_manager.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/gesture_manager.h"
+#include "components/view_manager/gesture_manager.h"
 
 #include <algorithm>
 
-#include "mojo/services/view_manager/gesture_manager_delegate.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/view_coordinate_conversions.h"
-#include "mojo/services/view_manager/view_locator.h"
+#include "components/view_manager/gesture_manager_delegate.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/view_coordinate_conversions.h"
+#include "components/view_manager/view_locator.h"
 #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/keys.h"
 #include "ui/gfx/geometry/point_f.h"
diff --git a/mojo/services/view_manager/gesture_manager.h b/components/view_manager/gesture_manager.h
index 666dfec..624bd2a 100644
--- a/mojo/services/view_manager/gesture_manager.h
+++ b/components/view_manager/gesture_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_GESTURE_MANAGER_H_
-#define SERVICES_VIEW_MANAGER_GESTURE_MANAGER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GESTURE_MANAGER_H_
+#define COMPONENTS_VIEW_MANAGER_GESTURE_MANAGER_H_
 
 #include <map>
 #include <set>
@@ -185,4 +185,4 @@ class GestureManager {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_GESTURE_MANAGER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GESTURE_MANAGER_H_
diff --git a/mojo/services/view_manager/gesture_manager_delegate.h b/components/view_manager/gesture_manager_delegate.h
index 7dcea1b..685458e 100644
--- a/mojo/services/view_manager/gesture_manager_delegate.h
+++ b/components/view_manager/gesture_manager_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_GESTURE_MANAGER_DELEGATE_H_
-#define SERVICES_VIEW_MANAGER_GESTURE_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GESTURE_MANAGER_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_GESTURE_MANAGER_DELEGATE_H_
 
 #include <set>
 
@@ -28,4 +28,4 @@ class GestureManagerDelegate {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_GESTURE_MANAGER_DELEGATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GESTURE_MANAGER_DELEGATE_H_
diff --git a/mojo/services/view_manager/gesture_manager_unittest.cc b/components/view_manager/gesture_manager_unittest.cc
index c3b2996..e65f2ae5 100644
--- a/mojo/services/view_manager/gesture_manager_unittest.cc
+++ b/components/view_manager/gesture_manager_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/gesture_manager.h"
+#include "components/view_manager/gesture_manager.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "mojo/services/view_manager/gesture_manager_delegate.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/test_server_view_delegate.h"
+#include "components/view_manager/gesture_manager_delegate.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/test_server_view_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/keys.h"
diff --git a/mojo/services/view_manager/ids.h b/components/view_manager/ids.h
index 90c3163..727ae05 100644
--- a/mojo/services/view_manager/ids.h
+++ b/components/view_manager/ids.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_IDS_H_
-#define SERVICES_VIEW_MANAGER_IDS_H_
+#ifndef COMPONENTS_VIEW_MANAGER_IDS_H_
+#define COMPONENTS_VIEW_MANAGER_IDS_H_
 
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/util.h"
@@ -59,4 +59,4 @@ inline ViewId ClonedViewId() {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_IDS_H_
+#endif  // COMPONENTS_VIEW_MANAGER_IDS_H_
diff --git a/mojo/services/view_manager/main.cc b/components/view_manager/main.cc
index d3ced3d..5c8735c 100644
--- a/mojo/services/view_manager/main.cc
+++ b/components/view_manager/main.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/view_manager/view_manager_app.h"
 #include "mojo/application/application_runner_chromium.h"
-#include "mojo/public/c/system/main.h"
-#include "mojo/services/view_manager/view_manager_app.h"
+#include "third_party/mojo/src/mojo/public/c/system/main.h"
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new view_manager::ViewManagerApp);
diff --git a/mojo/services/view_manager/scheduled_animation_group.cc b/components/view_manager/scheduled_animation_group.cc
index 0f27c42..210fa8e 100644
--- a/mojo/services/view_manager/scheduled_animation_group.cc
+++ b/components/view_manager/scheduled_animation_group.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/scheduled_animation_group.h"
+#include "components/view_manager/scheduled_animation_group.h"
 
 #include <set>
 
+#include "components/view_manager/server_view.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/transform/transform_type_converters.h"
-#include "mojo/services/view_manager/server_view.h"
 
 using mojo::ANIMATION_PROPERTY_NONE;
 using mojo::ANIMATION_PROPERTY_OPACITY;
diff --git a/mojo/services/view_manager/scheduled_animation_group.h b/components/view_manager/scheduled_animation_group.h
index 63aa899..274912d 100644
--- a/mojo/services/view_manager/scheduled_animation_group.h
+++ b/components/view_manager/scheduled_animation_group.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_SCHEDULED_ANIMATION_GROUP_H_
-#define SERVICES_VIEW_MANAGER_SCHEDULED_ANIMATION_GROUP_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SCHEDULED_ANIMATION_GROUP_H_
+#define COMPONENTS_VIEW_MANAGER_SCHEDULED_ANIMATION_GROUP_H_
 
 #include <vector>
 
@@ -107,4 +107,4 @@ class ScheduledAnimationGroup {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_SCHEDULED_ANIMATION_GROUP_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SCHEDULED_ANIMATION_GROUP_H_
diff --git a/mojo/services/view_manager/scheduled_animation_group_unittest.cc b/components/view_manager/scheduled_animation_group_unittest.cc
index bdef45a..ec30493 100644
--- a/mojo/services/view_manager/scheduled_animation_group_unittest.cc
+++ b/components/view_manager/scheduled_animation_group_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/scheduled_animation_group.h"
+#include "components/view_manager/scheduled_animation_group.h"
 
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/test_server_view_delegate.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/transform/transform_type_converters.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/test_server_view_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/animations.mojom.h"
 
diff --git a/mojo/services/view_manager/server_view.cc b/components/view_manager/server_view.cc
index 78edf38..344d2a8 100644
--- a/mojo/services/view_manager/server_view.cc
+++ b/components/view_manager/server_view.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/server_view.h"
+#include "components/view_manager/server_view.h"
 
 #include <inttypes.h>
 
 #include "base/strings/stringprintf.h"
-#include "mojo/services/view_manager/server_view_delegate.h"
-#include "mojo/services/view_manager/server_view_observer.h"
+#include "components/view_manager/server_view_delegate.h"
+#include "components/view_manager/server_view_observer.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/server_view.h b/components/view_manager/server_view.h
index b12c7bf..12d3107 100644
--- a/mojo/services/view_manager/server_view.h
+++ b/components/view_manager/server_view.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
-#define SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SERVER_VIEW_H_
+#define COMPONENTS_VIEW_MANAGER_SERVER_VIEW_H_
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/observer_list.h"
 #include "cc/surfaces/surface_id.h"
-#include "mojo/services/view_manager/ids.h"
+#include "components/view_manager/ids.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/transform.h"
@@ -117,4 +117,4 @@ class ServerView {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SERVER_VIEW_H_
diff --git a/mojo/services/view_manager/server_view_delegate.h b/components/view_manager/server_view_delegate.h
index 2f9a52b..71a8750 100644
--- a/mojo/services/view_manager/server_view_delegate.h
+++ b/components/view_manager/server_view_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
-#define SERVICES_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
 
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager_constants.mojom.h"
 
@@ -45,4 +45,4 @@ class ServerViewDelegate {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DELEGATE_H_
diff --git a/mojo/services/view_manager/server_view_drawn_tracker.cc b/components/view_manager/server_view_drawn_tracker.cc
index 8b79346..4ddf4df 100644
--- a/mojo/services/view_manager/server_view_drawn_tracker.cc
+++ b/components/view_manager/server_view_drawn_tracker.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/server_view_drawn_tracker.h"
+#include "components/view_manager/server_view_drawn_tracker.h"
 
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/server_view_drawn_tracker_observer.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/server_view_drawn_tracker_observer.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/server_view_drawn_tracker.h b/components/view_manager/server_view_drawn_tracker.h
index 85af309..46a9b0d 100644
--- a/mojo/services/view_manager/server_view_drawn_tracker.h
+++ b/components/view_manager/server_view_drawn_tracker.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_H_
-#define SERVICES_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_H_
+#define COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_H_
 
 #include <set>
 
 #include "base/basictypes.h"
-#include "mojo/services/view_manager/server_view_observer.h"
+#include "components/view_manager/server_view_observer.h"
 
 namespace view_manager {
 
@@ -55,4 +55,4 @@ class ServerViewDrawnTracker : public ServerViewObserver {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_H_
diff --git a/mojo/services/view_manager/server_view_drawn_tracker_observer.h b/components/view_manager/server_view_drawn_tracker_observer.h
index 1aacd65..3d0f2bf 100644
--- a/mojo/services/view_manager/server_view_drawn_tracker_observer.h
+++ b/components/view_manager/server_view_drawn_tracker_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_
-#define SERVICES_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_
+#define COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_
 
 namespace view_manager {
 
@@ -25,4 +25,4 @@ class ServerViewDrawnTrackerObserver {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_
diff --git a/mojo/services/view_manager/server_view_drawn_tracker_unittest.cc b/components/view_manager/server_view_drawn_tracker_unittest.cc
index 37a784b..58e34c8 100644
--- a/mojo/services/view_manager/server_view_drawn_tracker_unittest.cc
+++ b/components/view_manager/server_view_drawn_tracker_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/server_view_drawn_tracker.h"
+#include "components/view_manager/server_view_drawn_tracker.h"
 
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/server_view_drawn_tracker_observer.h"
-#include "mojo/services/view_manager/test_server_view_delegate.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/server_view_drawn_tracker_observer.h"
+#include "components/view_manager/test_server_view_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace view_manager {
diff --git a/mojo/services/view_manager/server_view_observer.h b/components/view_manager/server_view_observer.h
index bc12e3b..b686a2b 100644
--- a/mojo/services/view_manager/server_view_observer.h
+++ b/components/view_manager/server_view_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
-#define SERVICES_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
+#define COMPONENTS_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
 
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager_constants.mojom.h"
 
@@ -60,4 +60,4 @@ class ServerViewObserver {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_SERVER_VIEW_OBSERVER_H_
diff --git a/mojo/services/view_manager/test_change_tracker.cc b/components/view_manager/test_change_tracker.cc
index 3e31aa4..217ddca 100644
--- a/mojo/services/view_manager/test_change_tracker.cc
+++ b/components/view_manager/test_change_tracker.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/test_change_tracker.h"
+#include "components/view_manager/test_change_tracker.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
diff --git a/mojo/services/view_manager/test_change_tracker.h b/components/view_manager/test_change_tracker.h
index 822efad..bb1b55e 100644
--- a/mojo/services/view_manager/test_change_tracker.h
+++ b/components/view_manager/test_change_tracker.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
-#define SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
+#define COMPONENTS_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "mojo/public/cpp/bindings/array.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo_services/src/geometry/public/interfaces/geometry.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
@@ -154,4 +154,4 @@ class TestChangeTracker {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
+#endif  // COMPONENTS_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_
diff --git a/mojo/services/view_manager/test_server_view_delegate.cc b/components/view_manager/test_server_view_delegate.cc
index 32a5dd1..9a03712 100644
--- a/mojo/services/view_manager/test_server_view_delegate.cc
+++ b/components/view_manager/test_server_view_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/test_server_view_delegate.h"
+#include "components/view_manager/test_server_view_delegate.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/test_server_view_delegate.h b/components/view_manager/test_server_view_delegate.h
index 1615a11..b432752 100644
--- a/mojo/services/view_manager/test_server_view_delegate.h
+++ b/components/view_manager/test_server_view_delegate.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 SERVICES_VIEW_MANAGER_TEST_SERVER_VIEW_DELEGATE_H_
-#define SERVICES_VIEW_MANAGER_TEST_SERVER_VIEW_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_TEST_SERVER_VIEW_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_TEST_SERVER_VIEW_DELEGATE_H_
 
 #include "base/basictypes.h"
-#include "mojo/services/view_manager/server_view_delegate.h"
+#include "components/view_manager/server_view_delegate.h"
 
 namespace view_manager {
 
@@ -29,4 +29,4 @@ class TestServerViewDelegate : public ServerViewDelegate {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_TEST_SERVER_VIEW_DELEGATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_TEST_SERVER_VIEW_DELEGATE_H_
diff --git a/mojo/services/view_manager/view_coordinate_conversions.cc b/components/view_manager/view_coordinate_conversions.cc
index e8831f2..8237875 100644
--- a/mojo/services/view_manager/view_coordinate_conversions.cc
+++ b/components/view_manager/view_coordinate_conversions.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/view_coordinate_conversions.h"
+#include "components/view_manager/view_coordinate_conversions.h"
 
-#include "mojo/services/view_manager/server_view.h"
+#include "components/view_manager/server_view.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
diff --git a/mojo/services/view_manager/view_coordinate_conversions.h b/components/view_manager/view_coordinate_conversions.h
index 9f62eec..e232510 100644
--- a/mojo/services/view_manager/view_coordinate_conversions.h
+++ b/components/view_manager/view_coordinate_conversions.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_VIEW_COORDINATE_CONVERSIONS_H_
-#define SERVICES_VIEW_MANAGER_VIEW_COORDINATE_CONVERSIONS_H_
+#ifndef COMPONENTS_VIEW_MANAGER_VIEW_COORDINATE_CONVERSIONS_H_
+#define COMPONENTS_VIEW_MANAGER_VIEW_COORDINATE_CONVERSIONS_H_
 
 namespace gfx {
 class Point;
@@ -32,4 +32,4 @@ gfx::Rect ConvertRectBetweenViews(const ServerView* from,
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_VIEW_COORDINATE_CONVERSIONS_H_
+#endif  // COMPONENTS_VIEW_MANAGER_VIEW_COORDINATE_CONVERSIONS_H_
diff --git a/mojo/services/view_manager/view_coordinate_conversions_unittest.cc b/components/view_manager/view_coordinate_conversions_unittest.cc
index 100a064..addd466 100644
--- a/mojo/services/view_manager/view_coordinate_conversions_unittest.cc
+++ b/components/view_manager/view_coordinate_conversions_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/view_coordinate_conversions.h"
+#include "components/view_manager/view_coordinate_conversions.h"
 
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/server_view_delegate.h"
-#include "mojo/services/view_manager/test_server_view_delegate.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/server_view_delegate.h"
+#include "components/view_manager/test_server_view_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
diff --git a/mojo/services/view_manager/view_locator.cc b/components/view_manager/view_locator.cc
index 672b7c8..415eac8 100644
--- a/mojo/services/view_manager/view_locator.cc
+++ b/components/view_manager/view_locator.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/view_locator.h"
+#include "components/view_manager/view_locator.h"
 
-#include "mojo/services/view_manager/server_view.h"
+#include "components/view_manager/server_view.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/view_locator.h b/components/view_manager/view_locator.h
index 8937b75..13a1f0c 100644
--- a/mojo/services/view_manager/view_locator.h
+++ b/components/view_manager/view_locator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_VIEW_LOCATOR_H_
-#define SERVICES_VIEW_MANAGER_VIEW_LOCATOR_H_
+#ifndef COMPONENTS_VIEW_MANAGER_VIEW_LOCATOR_H_
+#define COMPONENTS_VIEW_MANAGER_VIEW_LOCATOR_H_
 
 namespace gfx {
 class Point;
@@ -21,4 +21,4 @@ ServerView* FindDeepestVisibleView(ServerView* view,
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_VIEW_LOCATOR_H_
+#endif  // COMPONENTS_VIEW_MANAGER_VIEW_LOCATOR_H_
diff --git a/mojo/services/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc
index 22292a3..a37119c 100644
--- a/mojo/services/view_manager/view_manager_app.cc
+++ b/components/view_manager/view_manager_app.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/view_manager_app.h"
+#include "components/view_manager/view_manager_app.h"
 
+#include "components/view_manager/client_connection.h"
+#include "components/view_manager/connection_manager.h"
+#include "components/view_manager/display_manager.h"
+#include "components/view_manager/view_manager_service_impl.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
-#include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/view_manager/client_connection.h"
-#include "mojo/services/view_manager/connection_manager.h"
-#include "mojo/services/view_manager/display_manager.h"
-#include "mojo/services/view_manager/view_manager_service_impl.h"
+#include "third_party/mojo/src/mojo/public/c/system/main.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationImpl;
diff --git a/mojo/services/view_manager/view_manager_app.h b/components/view_manager/view_manager_app.h
index 83f7961..3039a8a 100644
--- a/mojo/services/view_manager/view_manager_app.h
+++ b/components/view_manager/view_manager_app.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_
-#define SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_
+#ifndef COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_
+#define COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "components/view_manager/connection_manager_delegate.h"
 #include "mojo/common/tracing_impl.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/error_handler.h"
-#include "mojo/services/view_manager/connection_manager_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager_internal.mojom.h"
 
@@ -83,4 +83,4 @@ class ViewManagerApp
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_
+#endif  // COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_
diff --git a/mojo/services/view_manager/view_manager_client_apptest.cc b/components/view_manager/view_manager_client_apptest.cc
index e197c9f..2131a88 100644
--- a/mojo/services/view_manager/view_manager_client_apptest.cc
+++ b/components/view_manager/view_manager_client_apptest.cc
@@ -12,10 +12,10 @@
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"
 #include "third_party/mojo_services/src/geometry/public/cpp/geometry_util.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h"
diff --git a/mojo/services/view_manager/view_manager_service_apptest.cc b/components/view_manager/view_manager_service_apptest.cc
index 67ac384..7be0716 100644
--- a/mojo/services/view_manager/view_manager_service_apptest.cc
+++ b/components/view_manager/view_manager_service_apptest.cc
@@ -5,11 +5,11 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "components/view_manager/ids.h"
+#include "components/view_manager/test_change_tracker.h"
 #include "mojo/application/application_test_base_chromium.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/view_manager/ids.h"
-#include "mojo/services/view_manager/test_change_tracker.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager.mojom.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager_internal.mojom.h"
diff --git a/mojo/services/view_manager/view_manager_service_impl.cc b/components/view_manager/view_manager_service_impl.cc
index 2f45ae7..1283fca 100644
--- a/mojo/services/view_manager/view_manager_service_impl.cc
+++ b/components/view_manager/view_manager_service_impl.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/view_manager_service_impl.h"
+#include "components/view_manager/view_manager_service_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
+#include "components/view_manager/connection_manager.h"
+#include "components/view_manager/default_access_policy.h"
+#include "components/view_manager/display_manager.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/window_manager_access_policy.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/services/view_manager/connection_manager.h"
-#include "mojo/services/view_manager/default_access_policy.h"
-#include "mojo/services/view_manager/display_manager.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/window_manager_access_policy.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager_internal.mojom.h"
 
 using mojo::Array;
diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/components/view_manager/view_manager_service_impl.h
index bf156c3..0341b7e 100644
--- a/mojo/services/view_manager/view_manager_service_impl.h
+++ b/components/view_manager/view_manager_service_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
-#define SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
@@ -12,8 +12,8 @@
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/services/view_manager/access_policy_delegate.h"
-#include "mojo/services/view_manager/ids.h"
+#include "components/view_manager/access_policy_delegate.h"
+#include "components/view_manager/ids.h"
 #include "third_party/mojo_services/src/surfaces/public/interfaces/surface_id.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
 
@@ -257,4 +257,4 @@ class ViewManagerServiceImpl : public mojo::ViewManagerService,
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
diff --git a/mojo/services/view_manager/view_manager_service_unittest.cc b/components/view_manager/view_manager_service_unittest.cc
index 45527e9..b51e8f5 100644
--- a/mojo/services/view_manager/view_manager_service_unittest.cc
+++ b/components/view_manager/view_manager_service_unittest.cc
@@ -6,17 +6,17 @@
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
+#include "components/view_manager/client_connection.h"
+#include "components/view_manager/connection_manager.h"
+#include "components/view_manager/connection_manager_delegate.h"
+#include "components/view_manager/display_manager.h"
+#include "components/view_manager/ids.h"
+#include "components/view_manager/server_view.h"
+#include "components/view_manager/test_change_tracker.h"
+#include "components/view_manager/view_manager_service_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/view_manager/client_connection.h"
-#include "mojo/services/view_manager/connection_manager.h"
-#include "mojo/services/view_manager/connection_manager_delegate.h"
-#include "mojo/services/view_manager/display_manager.h"
-#include "mojo/services/view_manager/ids.h"
-#include "mojo/services/view_manager/server_view.h"
-#include "mojo/services/view_manager/test_change_tracker.h"
-#include "mojo/services/view_manager/view_manager_service_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/types.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/util.h"
 #include "third_party/mojo_services/src/view_manager/public/interfaces/view_manager.mojom.h"
diff --git a/mojo/services/view_manager/window_manager_access_policy.cc b/components/view_manager/window_manager_access_policy.cc
index 18696a0..600a4f6 100644
--- a/mojo/services/view_manager/window_manager_access_policy.cc
+++ b/components/view_manager/window_manager_access_policy.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/window_manager_access_policy.h"
+#include "components/view_manager/window_manager_access_policy.h"
 
-#include "mojo/services/view_manager/access_policy_delegate.h"
-#include "mojo/services/view_manager/server_view.h"
+#include "components/view_manager/access_policy_delegate.h"
+#include "components/view_manager/server_view.h"
 
 namespace view_manager {
 
diff --git a/mojo/services/view_manager/window_manager_access_policy.h b/components/view_manager/window_manager_access_policy.h
index c1840ae..94cda10 100644
--- a/mojo/services/view_manager/window_manager_access_policy.h
+++ b/components/view_manager/window_manager_access_policy.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 SERVICES_VIEW_MANAGER_WINDOW_MANAGER_ACCESS_POLICY_H_
-#define SERVICES_VIEW_MANAGER_WINDOW_MANAGER_ACCESS_POLICY_H_
+#ifndef COMPONENTS_VIEW_MANAGER_WINDOW_MANAGER_ACCESS_POLICY_H_
+#define COMPONENTS_VIEW_MANAGER_WINDOW_MANAGER_ACCESS_POLICY_H_
 
 #include "base/basictypes.h"
-#include "mojo/services/view_manager/access_policy.h"
+#include "components/view_manager/access_policy.h"
 
 namespace view_manager {
 
@@ -49,4 +49,4 @@ class WindowManagerAccessPolicy : public AccessPolicy {
 
 }  // namespace view_manager
 
-#endif  // SERVICES_VIEW_MANAGER_WINDOW_MANAGER_ACCESS_POLICY_H_
+#endif  // COMPONENTS_VIEW_MANAGER_WINDOW_MANAGER_ACCESS_POLICY_H_
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 6360ca9..ecddb11 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -20,24 +20,24 @@ group("services") {
   if (!is_component_build) {
     deps += [
       "//components/clipboard",
+      "//components/kiosk_wm:window_manager",
+      "//components/view_manager",
       "//components/window_manager:lib",
       "//mojo/services/html_viewer",
-      "//mojo/services/kiosk_wm:window_manager",
       "//mojo/services/native_viewport",
       "//mojo/services/network",
       "//mojo/services/surfaces",
       "//mojo/services/tracing",
-      "//mojo/services/view_manager",
     ]
 
     # TODO(GYP): Make this work.
     if (is_mac) {
       deps -= [
+        "//components/kiosk_wm:window_manager",
+        "//components/view_manager",
         "//components/window_manager:lib",
         "//mojo/services/html_viewer",
-        "//mojo/services/kiosk_wm:window_manager",
         "//mojo/services/native_viewport",
-        "//mojo/services/view_manager",
       ]
     }
   }
@@ -50,17 +50,17 @@ group("tests") {
   ]
   if (!is_component_build) {
     deps += [
+      "//components/view_manager:view_manager_service_unittests",
       "//components/window_manager:window_manager_unittests",
       "//mojo/services/html_viewer:tests",
-      "//mojo/services/view_manager:view_manager_service_unittests",
     ]
 
     # TODO(GYP): Make this work.
     if (is_mac) {
       deps -= [
+        "//components/view_manager:view_manager_service_unittests",
         "//components/window_manager:window_manager_unittests",
         "//mojo/services/html_viewer:tests",
-        "//mojo/services/view_manager:view_manager_service_unittests",
       ]
     }
   }
@@ -74,18 +74,18 @@ group("apptests") {
   if (!is_component_build) {
     deps += [
       "//components/clipboard:apptests",
+      "//components/view_manager:apptests",
       "//components/window_manager:apptests",
       "//mojo/services/html_viewer:apptests",
       "//mojo/services/network:apptests",
-      "//mojo/services/view_manager:apptests",
     ]
 
     # TODO(GYP): Make this work.
     if (is_mac) {
       deps -= [
+        "//components/view_manager:apptests",
         "//components/window_manager:apptests",
         "//mojo/services/html_viewer:apptests",
-        "//mojo/services/view_manager:apptests",
       ]
     }
   }