Revert of Makes change_id unsigned

mojo/services/view_manager/view_manager_connection_unittest.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/view_manager_connection.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 
 namespace {
 
-// TODO(sky): move ids.h into common place and include that.
-typedef uint32_t ChangeId;
-
 base::RunLoop* current_run_loop = NULL;
 
 // Sets |current_run_loop| and runs it. It is expected that someone else quits
 // the loop.
 void DoRunLoop() {
   base::RunLoop run_loop;
   current_run_loop = &run_loop;
   current_run_loop->Run();
   current_run_loop = NULL;
 }
@@ skipping 29 matching lines @@
   view_manager->CreateNode(id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // TODO(sky): make a macro for these functions, they are all the same.
 
 // Deletes a node, blocking until done.
 bool DeleteNode(ViewManager* view_manager,
                 uint32_t node_id,
-                ChangeId change_id) {
+                int32_t change_id) {
   bool result = false;
   view_manager->DeleteNode(node_id, change_id,
                            base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Adds a node, blocking until done.
 bool AddNode(ViewManager* view_manager,
              uint32_t parent,
              uint32_t child,
-             ChangeId change_id) {
+             int32_t change_id) {
   bool result = false;
   view_manager->AddNode(parent, child, change_id,
                         base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Removes a node, blocking until done.
 bool RemoveNodeFromParent(ViewManager* view_manager,
                           uint32_t node_id,
-                          ChangeId change_id) {
+                          int32_t change_id) {
   bool result = false;
   view_manager->RemoveNodeFromParent(node_id, change_id,
                                      base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Creates a view with the specified id. Returns true on success. Blocks until
 // we get back result from server.
 bool CreateView(ViewManager* view_manager, uint16_t id) {
   bool result = false;
   view_manager->CreateView(id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Sets a view on the specified node. Returns true on success. Blocks until we
 // get back result from server.
 bool SetView(ViewManager* view_manager,
              uint32_t node_id,
              uint32_t view_id,
-             ChangeId change_id) {
+             int32_t change_id) {
   bool result = false;
   view_manager->SetView(node_id, view_id, change_id,
                         base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 }  // namespace
 
 typedef std::vector<std::string> Changes;
@@ skipping 14 matching lines @@
 
  private:
   // ViewManagerClient overrides:
   virtual void OnConnectionEstablished(uint16_t connection_id) OVERRIDE {
     id_ = connection_id;
     current_run_loop->Quit();
   }
   virtual void OnNodeHierarchyChanged(uint32_t node,
                                       uint32_t new_parent,
                                       uint32_t old_parent,
-                                      ChangeId change_id) OVERRIDE {
+                                      int32_t change_id) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "change_id=%d node=%s new_parent=%s old_parent=%s",
-            static_cast<int>(change_id), NodeIdToString(node).c_str(),
+            change_id, NodeIdToString(node).c_str(),
             NodeIdToString(new_parent).c_str(),
             NodeIdToString(old_parent).c_str()));
     QuitIfNecessary();
   }
   virtual void OnNodeViewReplaced(uint32_t node,
                                   uint32_t new_view_id,
                                   uint32_t old_view_id,
-                                  ChangeId change_id) OVERRIDE {
+                                  int32_t change_id) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "change_id=%d node=%s new_view=%s old_view=%s",
-            static_cast<int>(change_id), NodeIdToString(node).c_str(),
+            change_id, NodeIdToString(node).c_str(),
             NodeIdToString(new_view_id).c_str(),
             NodeIdToString(old_view_id).c_str()));
     QuitIfNecessary();
   }
 
   void QuitIfNecessary() {
     if (quit_count_ > 0 && --quit_count_ == 0)
       current_run_loop->Quit();
   }
 
@@ skipping 335 matching lines @@
 
     Changes changes(client_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("change_id=0 node=1,1 new_view=null old_view=2,51", changes[0]);
   }
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo