Restructure public side of view_manager service.

services/view_manager/test_change_tracker.cc

 // 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.
 
 #include "services/view_manager/test_change_tracker.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/services/public/cpp/view_manager/util.h"
+#include "mojo/services/view_manager/public/cpp/util.h"
 
 namespace mojo {
 namespace service {
 
 std::string ViewIdToString(Id id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 namespace {
@@ skipping 268 matching lines @@
 std::string TestView::ToString2() const {
   return base::StringPrintf("view=%s parent=%s visible=%s drawn=%s",
                             ViewIdToString(view_id).c_str(),
                             ViewIdToString(parent_id).c_str(),
                             visible ? "true" : "false",
                             drawn ? "true" : "false");
 }
 
 }  // namespace service
 }  // namespace mojo