Restructure public side of surfaces service.

services/surfaces/surfaces_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 SERVICES_SURFACES_SURFACES_IMPL_H_
 #define SERVICES_SURFACES_SURFACES_IMPL_H_
 
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
 #include "mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace cc {
 class Display;
 }
 
 namespace mojo {
 class ApplicationManager;
 }
 
 namespace surfaces {
@@ skipping 60 matching lines @@
   mojo::ScopedMessagePipeHandle command_buffer_handle_;
   mojo::WeakBindingSet<ViewportParameterListener> parameter_listeners_;
   mojo::StrongBinding<Surface> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfacesImpl);
 };
 
 }  // namespace surfaces
 
 #endif  // SERVICES_SURFACES_SURFACES_IMPL_H_