Restructure public side of surfaces service.

sky/compositor/surface_holder.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 SKY_COMPOSITOR_SURFACE_HOLDER_H_
 #define SKY_COMPOSITOR_SURFACE_HOLDER_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/services/public/interfaces/surfaces/surface_id.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/surface_id.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 class Shell;
 }
 
 namespace sky {
 class SurfaceAllocator;
 
 class SurfaceHolder : public mojo::SurfaceClient {
@@ skipping 33 matching lines @@
   mojo::SurfaceIdPtr surface_id_;
 
   base::WeakPtrFactory<SurfaceHolder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceHolder);
 };
 
 }  // namespace sky
 
 #endif  // SKY_COMPOSITOR_SURFACE_HOLDER_H_