| Index: mojo/services/view_manager/view_manager_connection_unittest.cc
|
| diff --git a/mojo/services/view_manager/view_manager_connection_unittest.cc b/mojo/services/view_manager/view_manager_connection_unittest.cc
|
| index 231c903c413c3aa28a933bcca1c6a0deb398743a..abd03b35e9ebb7c98342c8f29befe71f9ebc11dc 100644
|
| --- a/mojo/services/view_manager/view_manager_connection_unittest.cc
|
| +++ b/mojo/services/view_manager/view_manager_connection_unittest.cc
|
| @@ -23,6 +23,9 @@ 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
|
| @@ -72,7 +75,7 @@ bool CreateNode(ViewManager* view_manager, uint16_t id) {
|
| // Deletes a node, blocking until done.
|
| bool DeleteNode(ViewManager* view_manager,
|
| uint32_t node_id,
|
| - int32_t change_id) {
|
| + ChangeId change_id) {
|
| bool result = false;
|
| view_manager->DeleteNode(node_id, change_id,
|
| base::Bind(&BooleanCallback, &result));
|
| @@ -84,7 +87,7 @@ bool DeleteNode(ViewManager* view_manager,
|
| bool AddNode(ViewManager* view_manager,
|
| uint32_t parent,
|
| uint32_t child,
|
| - int32_t change_id) {
|
| + ChangeId change_id) {
|
| bool result = false;
|
| view_manager->AddNode(parent, child, change_id,
|
| base::Bind(&BooleanCallback, &result));
|
| @@ -95,7 +98,7 @@ bool AddNode(ViewManager* view_manager,
|
| // Removes a node, blocking until done.
|
| bool RemoveNodeFromParent(ViewManager* view_manager,
|
| uint32_t node_id,
|
| - int32_t change_id) {
|
| + ChangeId change_id) {
|
| bool result = false;
|
| view_manager->RemoveNodeFromParent(node_id, change_id,
|
| base::Bind(&BooleanCallback, &result));
|
| @@ -117,7 +120,7 @@ bool CreateView(ViewManager* view_manager, uint16_t id) {
|
| bool SetView(ViewManager* view_manager,
|
| uint32_t node_id,
|
| uint32_t view_id,
|
| - int32_t change_id) {
|
| + ChangeId change_id) {
|
| bool result = false;
|
| view_manager->SetView(node_id, view_id, change_id,
|
| base::Bind(&BooleanCallback, &result));
|
| @@ -152,11 +155,11 @@ class ViewManagerClientImpl : public ViewManagerClient {
|
| virtual void OnNodeHierarchyChanged(uint32_t node,
|
| uint32_t new_parent,
|
| uint32_t old_parent,
|
| - int32_t change_id) OVERRIDE {
|
| + ChangeId change_id) OVERRIDE {
|
| changes_.push_back(
|
| base::StringPrintf(
|
| "change_id=%d node=%s new_parent=%s old_parent=%s",
|
| - change_id, NodeIdToString(node).c_str(),
|
| + static_cast<int>(change_id), NodeIdToString(node).c_str(),
|
| NodeIdToString(new_parent).c_str(),
|
| NodeIdToString(old_parent).c_str()));
|
| QuitIfNecessary();
|
| @@ -164,11 +167,11 @@ class ViewManagerClientImpl : public ViewManagerClient {
|
| virtual void OnNodeViewReplaced(uint32_t node,
|
| uint32_t new_view_id,
|
| uint32_t old_view_id,
|
| - int32_t change_id) OVERRIDE {
|
| + ChangeId change_id) OVERRIDE {
|
| changes_.push_back(
|
| base::StringPrintf(
|
| "change_id=%d node=%s new_view=%s old_view=%s",
|
| - change_id, NodeIdToString(node).c_str(),
|
| + static_cast<int>(change_id), NodeIdToString(node).c_str(),
|
| NodeIdToString(new_view_id).c_str(),
|
| NodeIdToString(old_view_id).c_str()));
|
| QuitIfNecessary();
|
|
|