Restructure public side of view_manager service.

mojo/services/view_manager/public/cpp/util.h

Index: mojo/services/view_manager/public/cpp/util.h
diff --git a/mojo/services/public/cpp/view_manager/util.h b/mojo/services/view_manager/public/cpp/util.h
similarity index 69%
rename from mojo/services/public/cpp/view_manager/util.h
rename to mojo/services/view_manager/public/cpp/util.h
index 72c904dbc3ba0e638c2b069e537644562de5fc6d..cc3ac39cae29e4be952bb0cda9fbcf4f09c12c29 100644
--- a/mojo/services/public/cpp/view_manager/util.h
+++ b/mojo/services/view_manager/public/cpp/util.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_VIEW_MANAGER_UTIL_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_UTIL_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
+#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
 
-#include "mojo/services/public/cpp/view_manager/types.h"
+#include "mojo/services/view_manager/public/cpp/types.h"
 
 // TODO(beng): #$*&@#(@ MacOSX SDK!
 #if defined(HiWord)
@@ -27,4 +27,4 @@ inline uint16_t LoWord(uint32_t id) {
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_UTIL_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_