Restructure public side of surfaces service.

examples/surfaces_app/child_impl.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 EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
 #define EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "examples/surfaces_app/child.mojom.h"
 #include "mojo/public/cpp/bindings/string.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 "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
 class CompositorFrame;
 }
 
 namespace mojo {
 
 class ApplicationConnection;
@@ skipping 38 matching lines @@
   mojo::Callback<void(SurfaceIdPtr id)> produce_callback_;
   base::WeakPtrFactory<ChildImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildImpl);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 #endif  // EXAMPLES_SURFACES_APP_CHILD_IMPL_H_