Restructure public side of view_manager service.

services/view_manager/view_manager_service_unittest.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 <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/cpp/view_manager/types.h"
-#include "mojo/services/public/cpp/view_manager/util.h"
-#include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
+#include "mojo/services/view_manager/public/cpp/types.h"
+#include "mojo/services/view_manager/public/cpp/util.h"
+#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "services/view_manager/client_connection.h"
 #include "services/view_manager/connection_manager.h"
 #include "services/view_manager/connection_manager_delegate.h"
 #include "services/view_manager/display_manager.h"
 #include "services/view_manager/ids.h"
 #include "services/view_manager/server_view.h"
 #include "services/view_manager/test_change_tracker.h"
 #include "services/view_manager/view_manager_service_impl.h"
@@ skipping 407 matching lines @@
   ASSERT_TRUE(cloned_view);
   // |cloned_view| should have a child and its child should have a child.
   ASSERT_EQ(1u, cloned_view->GetChildren().size());
   const ServerView* cloned_view_child = cloned_view->GetChildren()[0];
   EXPECT_EQ(1u, cloned_view_child->GetChildren().size());
   EXPECT_TRUE(cloned_view_child->id() == ClonedViewId());
 }
 
 }  // namespace service
 }  // namespace mojo