Restructure public side of surfaces service.

sky/compositor/resource_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 SKY_COMPOSITOR_RESOURCE_MANAGER_H_
 #define SKY_COMPOSITOR_RESOURCE_MANAGER_H_
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace mojo {
 class GLContext;
 class GLTexture;
 }
 
@@ skipping 15 matching lines @@
   base::WeakPtr<mojo::GLContext> gl_context_;
   uint32_t next_resource_id_;
   base::hash_map<uint32_t, mojo::GLTexture*> resource_to_texture_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceManager);
 };
 
 }  // namespace examples
 
 #endif  // SKY_COMPOSITOR_RESOURCE_MANAGER_H_