Restructure public side of view_manager service.

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

Index: mojo/services/public/cpp/view_manager/util.h
diff --git a/mojo/services/public/cpp/view_manager/util.h b/mojo/services/public/cpp/view_manager/util.h
deleted file mode 100644
index 72c904dbc3ba0e638c2b069e537644562de5fc6d..0000000000000000000000000000000000000000
--- a/mojo/services/public/cpp/view_manager/util.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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 MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_UTIL_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_UTIL_H_
-
-#include "mojo/services/public/cpp/view_manager/types.h"
-
-// TODO(beng): #$*&@#(@ MacOSX SDK!
-#if defined(HiWord)
-#undef HiWord
-#endif
-#if defined(LoWord)
-#undef LoWord
-#endif
-
-namespace mojo {
-
-inline uint16_t HiWord(uint32_t id) {
-  return static_cast<uint16_t>((id >> 16) & 0xFFFF);
-}
-
-inline uint16_t LoWord(uint32_t id) {
-  return static_cast<uint16_t>(id & 0xFFFF);
-}
-
-}  // namespace mojo
-
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_UTIL_H_