Get rid of ViewManagerTransactions & pending queue.

mojo/services/public/cpp/view_manager/tests/view_manager_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/public/cpp/view_manager/view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 24 matching lines @@
   base::RunLoop run_loop;
   current_run_loop = &run_loop;
   current_run_loop->Run();
   current_run_loop = NULL;
 }
 
 void QuitRunLoop() {
   current_run_loop->Quit();
 }
 
-void WaitForAllChangesToBeAcked(ViewManagerClientImpl* client) {
-  client->set_changes_acked_callback(base::Bind(&QuitRunLoop));
+void WaitForChangeToBeAcked(ViewManagerClientImpl* client) {
+  client->set_change_acked_callback(base::Bind(&QuitRunLoop));
   DoRunLoop();
-  client->ClearChangesAckedCallback();
+  client->ClearChangeAckedCallback();
 }
 
 class ConnectServiceLoader : public ServiceLoader,
                              public ApplicationDelegate,
                              public ViewManagerDelegate {
  public:
   typedef base::Callback<void(ViewManager*, Node*)> LoadedCallback;
 
   explicit ConnectServiceLoader(const LoadedCallback& callback)
       : callback_(callback), view_manager_client_factory_(this) {}
@@ skipping 584 matching lines @@
 // attached.
 TEST_F(ViewManagerTest, MapSubtreeOnAttach) {
   Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   // Create a subtree private to the window manager and make some changes to it.
   Node* child1 = Node::Create(window_manager());
   Node* child11 = Node::Create(window_manager());
   child1->AddChild(child11);
+  WaitForChangeToBeAcked(
+      static_cast<ViewManagerClientImpl*>(window_manager()));
   gfx::Rect child11_bounds(800, 600);
   child11->SetBounds(child11_bounds);
+  WaitForChangeToBeAcked(
+      static_cast<ViewManagerClientImpl*>(window_manager()));
   View* view11 = View::Create(window_manager());
   child11->SetActiveView(view11);
-  WaitForAllChangesToBeAcked(
+  WaitForChangeToBeAcked(
       static_cast<ViewManagerClientImpl*>(window_manager()));
 
   // When added to the shared node, the entire hierarchy and all property
   // changes should become visible to the embedded app.
   node->AddChild(child1);
   WaitForTreeSizeToMatch(embedded->GetRoots().front(), 3);
 
   Node* child11_in_embedded = embedded->GetNodeById(child11->id());
   View* view11_in_embedded = embedded->GetViewById(view11->id());
   EXPECT_TRUE(child11_in_embedded != NULL);
@@ skipping 105 matching lines @@
 // TODO(beng): tests for view event dispatcher.
 // - verify that we see events for all views.
 
 // TODO(beng): tests for focus:
 // - focus between two nodes known to a connection
 // - focus between nodes unknown to one of the connections.
 // - focus between nodes unknown to either connection.
 
 }  // namespace view_manager
 }  // namespace mojo