Minor cleanup of view manager test

mojo/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 "mojo/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/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 std::string NodeIdToString(TransportNodeId id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 namespace {
 
-void INodesToTestNodes(const Array<INodePtr>& data,
-                       std::vector<TestNode>* test_nodes) {
-  for (size_t i = 0; i < data.size(); ++i) {
-    TestNode node;
-    node.parent_id = data[i]->parent_id;
-    node.node_id = data[i]->node_id;
-    node.view_id = data[i]->view_id;
-    test_nodes->push_back(node);
-  }
-}
-
 std::string RectToString(const gfx::Rect& rect) {
   return base::StringPrintf("%d,%d %dx%d", rect.x(), rect.y(), rect.width(),
                             rect.height());
 }
 
 std::string ChangeToDescription1(const Change& change) {
   switch (change.type) {
     case CHANGE_TYPE_CONNECTION_ESTABLISHED:
       return "OnConnectionEstablished";
 
@@ skipping 48 matching lines @@
 
 std::string ChangeNodeDescription(const std::vector<Change>& changes) {
   if (changes.size() != 1)
     return std::string();
   std::vector<std::string> node_strings(changes[0].nodes.size());
   for (size_t i = 0; i < changes[0].nodes.size(); ++i)
     node_strings[i] = "[" + changes[0].nodes[i].ToString() + "]";
   return JoinString(node_strings, ',');
 }
 
+void INodesToTestNodes(const Array<INodePtr>& data,
+                       std::vector<TestNode>* test_nodes) {
+  for (size_t i = 0; i < data.size(); ++i) {
+    TestNode node;
+    node.parent_id = data[i]->parent_id;
+    node.node_id = data[i]->node_id;
+    node.view_id = data[i]->view_id;
+    test_nodes->push_back(node);
+  }
+}
+
 Change::Change()
     : type(CHANGE_TYPE_CONNECTION_ESTABLISHED),
       connection_id(0),
       change_id(0),
       node_id(0),
       node_id2(0),
       node_id3(0),
       view_id(0),
       view_id2(0) {}
 
@@ skipping 91 matching lines @@
 std::string TestNode::ToString() const {
   return base::StringPrintf("node=%s parent=%s view=%s",
                             NodeIdToString(node_id).c_str(),
                             NodeIdToString(parent_id).c_str(),
                             NodeIdToString(view_id).c_str());
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo