Restructure public side of surfaces service.

services/view_manager/display_manager.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 "services/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/services/public/cpp/surfaces/surfaces_utils.h"
 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/quads.mojom.h"
+#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
+#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
 #include "services/view_manager/connection_manager.h"
 #include "services/view_manager/server_view.h"
 #include "services/view_manager/view_coordinate_conversions.h"
 
 namespace mojo {
 namespace service {
 namespace {
 
 void DrawViewTree(Pass* pass,
                   const ServerView* view,
@@ skipping 150 matching lines @@
   SchedulePaint(connection_manager_->root(), gfx::Rect(size_));
 }
 
 void DefaultDisplayManager::ReturnResources(
     Array<ReturnedResourcePtr> resources) {
   DCHECK_EQ(0u, resources.size());
 }
 
 }  // namespace service
 }  // namespace mojo