Cleans up usage of ViewManagerServiceImpl::roots_

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 156 matching lines @@
       count += CountNodes(*it);
     return count;
   }
 
   Node* tree_;
   size_t tree_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeSizeMatchesObserver);
 };
 
+void WaitForTreeSizeToMatch(Node* node, size_t tree_size) {
+  TreeSizeMatchesObserver observer(node, tree_size);
+  if (observer.IsTreeCorrectSize())
+    return;
+  node->AddObserver(&observer);
+  DoRunLoop();
+  node->RemoveObserver(&observer);
+}
+
 // Utility class that waits for the destruction of some number of nodes and
 // views.
 class DestructionObserver : public NodeObserver, public ViewObserver {
  public:
   // |nodes| or |views| can be NULL.
   DestructionObserver(std::set<Id>* nodes, std::set<Id>* views)
       : nodes_(nodes),
         views_(views) {}
 
  private:
@@ skipping 432 matching lines @@
   Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
   EXPECT_EQ(kWindowManagerURL, embedded->GetEmbedderURL());
 }
 
 TEST_F(ViewManagerTest, Reorder) {
   Node* node1 = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node1);
 
-  Node* node11 = Node::Create(window_manager());
-  node1->AddChild(node11);
-  Node* node12 = Node::Create(window_manager());
-  node1->AddChild(node12);
-
   ViewManager* embedded = Embed(window_manager(), node1);
 
-  Node* node1_in_embedded = embedded->GetNodeById(node1->id());
+  Node* node11 = Node::Create(embedded);
+  embedded->GetRoots().front()->AddChild(node11);
+  Node* node12 = Node::Create(embedded);
+  embedded->GetRoots().front()->AddChild(node12);
+
+  Node* node1_in_wm = window_manager()->GetNodeById(node1->id());
 
   {
+    WaitForTreeSizeToMatch(node1, 2u);
     node11->MoveToFront();
-    WaitForOrderChange(embedded, embedded->GetNodeById(node11->id()));
+    WaitForOrderChange(window_manager(),
+                       window_manager()->GetNodeById(node11->id()));
 
-    EXPECT_EQ(node1_in_embedded->children().front(),
-              embedded->GetNodeById(node12->id()));
-    EXPECT_EQ(node1_in_embedded->children().back(),
-              embedded->GetNodeById(node11->id()));
+    EXPECT_EQ(node1_in_wm->children().front(),
+              window_manager()->GetNodeById(node12->id()));
+    EXPECT_EQ(node1_in_wm->children().back(),
+              window_manager()->GetNodeById(node11->id()));
   }
 
   {
     node11->MoveToBack();
-    WaitForOrderChange(embedded, embedded->GetNodeById(node11->id()));
+    WaitForOrderChange(window_manager(),
+                       window_manager()->GetNodeById(node11->id()));
 
-    EXPECT_EQ(node1_in_embedded->children().front(),
-              embedded->GetNodeById(node11->id()));
-    EXPECT_EQ(node1_in_embedded->children().back(),
-              embedded->GetNodeById(node12->id()));
+    EXPECT_EQ(node1_in_wm->children().front(),
+              window_manager()->GetNodeById(node11->id()));
+    EXPECT_EQ(node1_in_wm->children().back(),
+              window_manager()->GetNodeById(node12->id()));
   }
 }
 
 // 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 mojo