Restructure public side of surfaces service.

services/view_manager/display_manager.h

 // 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.
 
 #ifndef SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "cc/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 class SurfaceIdAllocator;
 }
 
 namespace mojo {
 
 class ApplicationConnection;
 
@@ skipping 59 matching lines @@
   Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_