Restructure public side of surfaces service.

mojo/services/surfaces/public/cpp/surfaces_utils.h

Index: mojo/services/surfaces/public/cpp/surfaces_utils.h
diff --git a/mojo/services/public/cpp/surfaces/surfaces_utils.h b/mojo/services/surfaces/public/cpp/surfaces_utils.h
similarity index 67%
rename from mojo/services/public/cpp/surfaces/surfaces_utils.h
rename to mojo/services/surfaces/public/cpp/surfaces_utils.h
index a8fd2e8d59bec5ec9a63abee6eab048d1ff49da1..89aafdfa6d1a89e38197410b4b6979b6678d8711 100644
--- a/mojo/services/public/cpp/surfaces/surfaces_utils.h
+++ b/mojo/services/surfaces/public/cpp/surfaces_utils.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_SURFACES_SURFACES_UTILS_H_
-#define MOJO_SERVICES_PUBLIC_CPP_SURFACES_SURFACES_UTILS_H_
+#ifndef MOJO_SERVICES_SURFACES_PUBLIC_CPP_SURFACES_UTILS_H_
+#define MOJO_SERVICES_SURFACES_PUBLIC_CPP_SURFACES_UTILS_H_
 
-#include "mojo/services/public/interfaces/surfaces/quads.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
 
 namespace mojo {
 class Rect;
@@ -20,4 +20,4 @@ PassPtr CreateDefaultPass(int id, const Rect& rect);
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_SURFACES_SURFACES_UTILS_H_
+#endif  // MOJO_SERVICES_SURFACES_PUBLIC_CPP_SURFACES_UTILS_H_