Makes Embed() take a single node

mojo/services/view_manager/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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 149 matching lines @@
     RunMainLoop();
     return result;
   }
   void GetNodeTree(Id node_id, std::vector<TestNode>* nodes) {
     changes_.clear();
     view_manager_->GetNodeTree(node_id,
                                base::Bind(&ViewManagerProxy::GotNodeTree,
                                           base::Unretained(this), nodes));
     RunMainLoop();
   }
-  bool Embed(const std::vector<Id>& nodes) {
+  bool Embed(const Id node_id) {
     changes_.clear();
     base::AutoReset<bool> auto_reset(&in_embed_, true);
     bool result = false;
-    view_manager_->Embed(kTestServiceURL, Array<Id>::From(nodes),
+    view_manager_->Embed(kTestServiceURL, node_id,
                          base::Bind(&ViewManagerProxy::GotResult,
                                     base::Unretained(this), &result));
     RunMainLoop();
     return result;
   }
   bool DeleteNode(Id node_id, Id server_change_id) {
     changes_.clear();
     bool result = false;
     view_manager_->DeleteNode(node_id,
                               server_change_id,
@@ skipping 132 matching lines @@
 
   // ViewMangerClient:
   virtual void OnViewManagerConnectionEstablished(
       ConnectionSpecificId connection_id,
       const String& creator_url,
       Id next_server_change_id,
       Array<NodeDataPtr> nodes) OVERRIDE {
     tracker_.OnViewManagerConnectionEstablished(
         connection_id, creator_url, next_server_change_id, nodes.Pass());
   }
-  virtual void OnRootsAdded(Array<NodeDataPtr> nodes) OVERRIDE {
-    tracker_.OnRootsAdded(nodes.Pass());
+  virtual void OnRootAdded(Array<NodeDataPtr> nodes) OVERRIDE {
+    tracker_.OnRootAdded(nodes.Pass());
   }
   virtual void OnServerChangeIdAdvanced(
       Id next_server_change_id) OVERRIDE {
     tracker_.OnServerChangeIdAdvanced(next_server_change_id);
   }
   virtual void OnNodeBoundsChanged(Id node_id,
                                    RectPtr old_bounds,
                                    RectPtr new_bounds) OVERRIDE {
     tracker_.OnNodeBoundsChanged(node_id, old_bounds.Pass(), new_bounds.Pass());
   }
@@ skipping 132 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     if (connection2_)
       connection2_->Destroy();
     if (connection_)
       connection_->Destroy();
   }
 
  protected:
-  void EstablishSecondConnectionWithRoots(Id id1, Id id2) {
-    std::vector<Id> node_ids;
-    node_ids.push_back(id1);
-    if (id2 != 0)
-      node_ids.push_back(id2);
-    ASSERT_TRUE(connection_->Embed(node_ids));
+  void EstablishSecondConnectionWithRoot(Id root_id) {
+    ASSERT_TRUE(connection_->Embed(root_id));
     connection2_ = ViewManagerProxy::WaitForInstance();
     ASSERT_TRUE(connection2_ != NULL);
     connection2_->DoRunLoopUntilChangesCount(1);
     ASSERT_EQ(1u, connection2_->changes().size());
   }
 
   // Creates a second connection to the viewmanager.
   void EstablishSecondConnection(bool create_initial_node) {
     if (create_initial_node)
       ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 1)));
     ASSERT_NO_FATAL_FAILURE(
-        EstablishSecondConnectionWithRoots(BuildNodeId(1, 1), 0));
+        EstablishSecondConnectionWithRoot(BuildNodeId(1, 1)));
     const std::vector<Change>& changes(connection2_->changes());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url",
               ChangesToDescription1(changes)[0]);
     if (create_initial_node) {
       EXPECT_EQ("[node=1,1 parent=null view=null]",
                 ChangeNodeDescription(changes));
     }
   }
 
@@ skipping 664 matching lines @@
 // Various assertions around SetRoots.
 TEST_F(ViewManagerTest, SetRoots) {
   // Create 1, 2, and 3 in the first connection.
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 1)));
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 2)));
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 3)));
 
   // Parent 1 to the root.
   ASSERT_TRUE(connection_->AddNode(BuildNodeId(0, 1), BuildNodeId(1, 1), 1));
 
-  // Establish the second connection and give it the roots 1 and 3.
+  // Establish the second connection with roots 1 and 3.
   {
-    ASSERT_NO_FATAL_FAILURE(EstablishSecondConnectionWithRoots(
-                                BuildNodeId(1, 1), BuildNodeId(1, 3)));
+    ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
+
+    ASSERT_TRUE(connection_->Embed(BuildNodeId(1, 3)));
+    connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
-    EXPECT_EQ("OnConnectionEstablished creator=mojo:test_url", changes[0]);
-    EXPECT_EQ("[node=1,1 parent=null view=null],"
-              "[node=1,3 parent=null view=null]",
+    EXPECT_EQ("OnRootAdded", changes[0]);
+    EXPECT_EQ("[node=1,3 parent=null view=null]",
               ChangeNodeDescription(connection2_->changes()));
   }
 
   // Create 4 and add it to the root, connection 2 should only get id advanced.
   {
     ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 4)));
     ASSERT_TRUE(connection_->AddNode(BuildNodeId(0, 1), BuildNodeId(1, 4), 2));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
@@ skipping 140 matching lines @@
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 1)));
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 2)));
 
   ASSERT_TRUE(connection_->AddNode(BuildNodeId(1, 1), BuildNodeId(1, 2), 1));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   // Try to connect again to 1,1, this should fail as already connected to that
   // root.
   {
-    std::vector<Id> node_ids;
-    node_ids.push_back(BuildNodeId(1, 1));
-    ASSERT_FALSE(connection_->Embed(node_ids));
+    ASSERT_FALSE(connection_->Embed(BuildNodeId(1, 1)));
   }
 
   // Connecting to 1,2 should succeed and end up in connection2.
   {
-    std::vector<Id> node_ids;
-    node_ids.push_back(BuildNodeId(1, 2));
-    ASSERT_TRUE(connection_->Embed(node_ids));
+    ASSERT_TRUE(connection_->Embed(BuildNodeId(1, 2)));
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
-    EXPECT_EQ("OnRootsAdded", changes[0]);
+    EXPECT_EQ("OnRootAdded", changes[0]);
     EXPECT_EQ("[node=1,2 parent=1,1 view=null]",
               ChangeNodeDescription(connection2_->changes()));
   }
 }
 
 TEST_F(ViewManagerTest, OnViewInput) {
   // Create node 1 and assign a view from connection 2 to it.
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 1)));
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
   ASSERT_TRUE(connection2_->CreateView(BuildViewId(2, 11)));
@@ skipping 21 matching lines @@
 // originating connection.
 
 // TODO(beng): Add 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 service
 }  // namespace view_manager
 }  // namespace mojo