Mojo: more idiomatic C++ bindings

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 <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/common/common_type_converters.h"
 #include "mojo/geometry/geometry_type_converters.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/shell/connect.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
-
-// TODO(sky): remove this when Darin is done with cleanup.
-template <typename T>
-class MOJO_COMMON_EXPORT TypeConverter<T, T> {
- public:
-  static T ConvertFrom(T input, Buffer* buf) {
-    return input;
-  }
-  static T ConvertTo(T input) {
-    return input;
-  }
-
-  MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
-};
-
 namespace view_manager {
 namespace service {
 
 namespace {
 
 base::RunLoop* current_run_loop = NULL;
 
 // Sets |current_run_loop| and runs it. It is expected that someone else quits
 // the loop.
 void DoRunLoop() {
   DCHECK(!current_run_loop);
 
   base::RunLoop run_loop;
   current_run_loop = &run_loop;
   current_run_loop->Run();
   current_run_loop = NULL;
 }
 
 // Converts |id| into a string.
 std::string NodeIdToString(TransportNodeId id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 // Converts |rect| into a string.
-std::string RectToString(const Rect& rect) {
+std::string RectToString(const RectPtr& rect) {
   return base::StringPrintf("%d,%d %dx%d",
-                            rect.position().x(),
-                            rect.position().y(),
-                            rect.size().width(),
-                            rect.size().height());
+                            rect->position->x,
+                            rect->position->y,
+                            rect->size->width,
+                            rect->size->height);
 }
 
 // Boolean callback. Sets |result_cache| to the value of |result| and quits
 // the run loop.
 void BooleanCallback(bool* result_cache, bool result) {
   *result_cache = result;
   current_run_loop->Quit();
 }
 
 struct TestNode {
   std::string ToString() const {
     return base::StringPrintf("node=%s parent=%s view=%s",
                               NodeIdToString(node_id).c_str(),
                               NodeIdToString(parent_id).c_str(),
                               NodeIdToString(view_id).c_str());
   }
 
   TransportNodeId parent_id;
   TransportNodeId node_id;
   TransportNodeId view_id;
 };
 
-void INodesToTestNodes(const mojo::Array<INode>& data,
+void INodesToTestNodes(const mojo::Array<INodePtr>& data,
                        std::vector<TestNode>* test_nodes) {
   for (size_t i = 0; i < data.size(); ++i) {
     TestNode node;
-    node.parent_id = data[i].parent_id();
-    node.node_id = data[i].node_id();
-    node.view_id = data[i].view_id();
+    node.parent_id = data[i]->parent_id;
+    node.node_id = data[i]->node_id;
+    node.view_id = data[i]->view_id;
     test_nodes->push_back(node);
   }
 }
 
 // Callback that results in a vector of INodes. The INodes are converted to
 // TestNodes.
 void INodesCallback(std::vector<TestNode>* test_nodes,
-                    const mojo::Array<INode>& data) {
+                    mojo::Array<INodePtr> data) {
   INodesToTestNodes(data, test_nodes);
   current_run_loop->Quit();
 }
 
 // Creates an id used for transport from the specified parameters.
 TransportNodeId CreateNodeId(TransportConnectionId connection_id,
                              TransportConnectionSpecificNodeId node_id) {
   return (connection_id << 16) | node_id;
 }
 
@@ skipping 28 matching lines @@
   bool result = false;
   view_manager->DeleteView(view_id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 bool SetNodeBounds(IViewManager* view_manager,
                    TransportNodeId node_id,
                    const gfx::Rect& bounds) {
   bool result = false;
-  view_manager->SetNodeBounds(node_id, bounds,
+  view_manager->SetNodeBounds(node_id, Rect::From(bounds),
                               base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
 // Adds a node, blocking until done.
 bool AddNode(IViewManager* view_manager,
              TransportNodeId parent,
              TransportNodeId child,
              TransportChangeId server_change_id) {
@@ skipping 100 matching lines @@
       return;
     quit_count_ = count - changes_.size();
     DoRunLoop();
   }
 
  private:
   // IViewManagerClient overrides:
   virtual void OnViewManagerConnectionEstablished(
       TransportConnectionId connection_id,
       TransportChangeId next_server_change_id,
-      const mojo::Array<INode>& nodes) OVERRIDE {
+      mojo::Array<INodePtr> nodes) OVERRIDE {
     id_ = connection_id;
     next_server_change_id_ = next_server_change_id;
     initial_nodes_.clear();
     INodesToTestNodes(nodes, &initial_nodes_);
     changes_.push_back("OnConnectionEstablished");
     QuitIfNecessary();
   }
   virtual void OnServerChangeIdAdvanced(
       uint32_t next_server_change_id) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "ServerChangeIdAdvanced %d",
             static_cast<int>(next_server_change_id)));
     QuitIfNecessary();
   }
   virtual void OnNodeBoundsChanged(TransportNodeId node_id,
-                                   const Rect& old_bounds,
-                                   const Rect& new_bounds) OVERRIDE {
+                                   RectPtr old_bounds,
+                                   RectPtr new_bounds) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "BoundsChanged node=%s old_bounds=%s new_bounds=%s",
             NodeIdToString(node_id).c_str(),
             RectToString(old_bounds).c_str(),
             RectToString(new_bounds).c_str()));
     QuitIfNecessary();
   }
   virtual void OnNodeHierarchyChanged(
       TransportNodeId node,
       TransportNodeId new_parent,
       TransportNodeId old_parent,
       TransportChangeId server_change_id,
-      const mojo::Array<INode>& nodes) OVERRIDE {
+      mojo::Array<INodePtr> nodes) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "HierarchyChanged change_id=%d node=%s new_parent=%s old_parent=%s",
             static_cast<int>(server_change_id),
             NodeIdToString(node).c_str(),
             NodeIdToString(new_parent).c_str(),
             NodeIdToString(old_parent).c_str()));
     hierarchy_changed_nodes_.clear();
     INodesToTestNodes(nodes, &hierarchy_changed_nodes_);
     QuitIfNecessary();
@@ skipping 69 matching lines @@
     view_manager2_.set_client(&client2_);
 
     client2_.WaitForId();
     client2_.GetAndClearChanges();
   }
 
   void EstablishSecondConnectionWithRoot(TransportNodeId root_id) {
     EstablishSecondConnection();
     client2_.ClearId();
 
-    AllocationScope scope;
     std::vector<uint32_t> roots;
     roots.push_back(root_id);
     ASSERT_TRUE(SetRoots(view_manager_.get(), 2, roots));
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("OnConnectionEstablished", changes[0]);
     ASSERT_NE(0u, client2_.id());
     const std::vector<TestNode>& nodes(client2_.initial_nodes());
     ASSERT_EQ(1u, nodes.size());
@@ skipping 54 matching lines @@
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
 
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   EstablishSecondConnection();
   EXPECT_TRUE(client2_.GetAndClearChanges().empty());
 
   // Make 2 a child of 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 1),
                         CreateNodeId(client_.id(), 2),
                         1));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 2", changes[0]);
   }
 
   // Remove 2 from its parent.
   {
-    AllocationScope scope;
     ASSERT_TRUE(RemoveNodeFromParent(view_manager_.get(),
                                      CreateNodeId(client_.id(), 2),
                                      2));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 3", changes[0]);
   }
 }
 
 // Verifies AddNode fails when node is already in position.
 TEST_F(ViewManagerConnectionTest, AddNodeWithNoChange) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
 
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   EstablishSecondConnection();
   EXPECT_TRUE(client2_.GetAndClearChanges().empty());
 
   // Make 2 a child of 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 1),
                         CreateNodeId(client_.id(), 2),
                         1));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 2", changes[0]);
   }
 
   // Try again, this should fail.
   {
-    AllocationScope scope;
     EXPECT_FALSE(AddNode(view_manager_.get(),
                          CreateNodeId(client_.id(), 1),
                          CreateNodeId(client_.id(), 2),
                          2));
     Changes changes(client_.GetAndClearChanges());
     EXPECT_TRUE(changes.empty());
   }
 }
 
 // Verifies AddNode fails when node is already in position.
 TEST_F(ViewManagerConnectionTest, AddAncestorFails) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
 
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   EstablishSecondConnection();
   EXPECT_TRUE(client2_.GetAndClearChanges().empty());
 
   // Make 2 a child of 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 1),
                         CreateNodeId(client_.id(), 2),
                         1));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 2", changes[0]);
   }
 
   // Try to make 1 a child of 2, this should fail since 1 is an ancestor of 2.
   {
-    AllocationScope scope;
     EXPECT_FALSE(AddNode(view_manager_.get(),
                          CreateNodeId(client_.id(), 2),
                          CreateNodeId(client_.id(), 1),
                          2));
     Changes changes(client_.GetAndClearChanges());
     EXPECT_TRUE(changes.empty());
   }
 }
 
 // Verifies adding with an invalid id fails.
 TEST_F(ViewManagerConnectionTest, AddWithInvalidServerId) {
   // Create two nodes.
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
 
   // Make 2 a child of 1. Supply an invalid change id, which should fail.
   {
-    AllocationScope scope;
     ASSERT_FALSE(AddNode(view_manager_.get(),
                          CreateNodeId(client_.id(), 1),
                          CreateNodeId(client_.id(), 2),
                          0));
     Changes changes(client_.GetAndClearChanges());
     EXPECT_TRUE(changes.empty());
   }
 }
 
 // Verifies adding to root sends right notifications.
 TEST_F(ViewManagerConnectionTest, AddToRoot) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 21));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 3));
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   EstablishSecondConnection();
   EXPECT_TRUE(client2_.GetAndClearChanges().empty());
 
   // Make 3 a child of 21.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 21),
                         CreateNodeId(client_.id(), 3),
                         1));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 2", changes[0]);
   }
 
   // Make 21 a child of the root.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 21),
                         2));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ(
         "HierarchyChanged change_id=2 node=1,21 new_parent=0,1 old_parent=null",
         changes[0]);
   }
 }
 
 // Verifies adding to root sends right notifications.
 TEST_F(ViewManagerConnectionTest, NodeHierarchyChangedNodes) {
   // Create nodes 1 and 11 with 1 parented to the root and 11 a child of 1.
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 11));
 
   // Make 11 a child of 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 1),
                         CreateNodeId(client_.id(), 11),
                         1));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
   }
 
   EstablishSecondConnection();
 
   // Make 1 a child of the root.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 1),
                         2));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
 
     // Client 2 should get a hierarchy change that includes the new nodes as it
     // has not yet seen them.
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ(
         "HierarchyChanged change_id=2 node=1,1 new_parent=0,1 old_parent=null",
         changes[0]);
     const std::vector<TestNode>& nodes(client2_.hierarchy_changed_nodes());
     ASSERT_EQ(2u, nodes.size());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,11 parent=1,1 view=null", nodes[1].ToString());
   }
 
   // Remove 1 from the root.
   {
-    AllocationScope scope;
     ASSERT_TRUE(RemoveNodeFromParent(view_manager_.get(),
                                      CreateNodeId(client_.id(), 1),
                                      3));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ(
         "HierarchyChanged change_id=3 node=1,1 new_parent=null old_parent=0,1",
         changes[0]);
   }
 
   // Create another node, 111, parent it to 11.
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 111));
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 11),
                         CreateNodeId(client_.id(), 111),
                         4));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     // Even though 11 isn't attached to the root client 2 is still notified of
@@ skipping 27 matching lines @@
 TEST_F(ViewManagerConnectionTest, NodeHierarchyChangedAddingKnownToUnknown) {
   // Create the following structure: root -> 1 -> 11 and 2->21 (2 has no
   // parent).
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 11));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 21));
 
   // Set up the hierarchy.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 1),
                         1));
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 1),
                         CreateNodeId(client_.id(), 11),
                         2));
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 2),
                         CreateNodeId(client_.id(), 21),
                         3));
   }
 
   EstablishSecondConnection();
 
   // Remove 11.
   {
-    AllocationScope scope;
     ASSERT_TRUE(RemoveNodeFromParent(view_manager_.get(),
                                      CreateNodeId(client_.id(), 11),
                                      4));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ(
         "HierarchyChanged change_id=4 node=1,11 new_parent=null old_parent=1,1",
         changes[0]);
     EXPECT_TRUE(client2_.hierarchy_changed_nodes().empty());
   }
 
   // Add 11 to 21. As client2 knows about 11 it should receive the new
   // hierarchy.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 21),
                         CreateNodeId(client_.id(), 11),
                         5));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ(
         "HierarchyChanged change_id=5 node=1,11 new_parent=1,21 "
         "old_parent=null", changes[0]);
     const std::vector<TestNode>& nodes(client2_.hierarchy_changed_nodes());
     ASSERT_EQ(2u, nodes.size());
     EXPECT_EQ("node=1,2 parent=null view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,21 parent=1,2 view=null", nodes[1].ToString());
   }
 }
 
 // Verifies connection on told descendants of the root when connecting.
 TEST_F(ViewManagerConnectionTest, GetInitialNodesOnInit) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 21));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 3));
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   // Make 3 a child of 21.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 21),
                         CreateNodeId(client_.id(), 3),
                         1));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
   }
 
   // Make 21 a child of the root.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 21),
                         2));
     ASSERT_TRUE(client_.GetAndClearChanges().empty());
   }
 
   EstablishSecondConnection();
   // Should get notification of children of the root.
   const std::vector<TestNode>& nodes(client2_.initial_nodes());
   ASSERT_EQ(3u, nodes.size());
   EXPECT_EQ("node=0,1 parent=null view=null", nodes[0].ToString());
   EXPECT_EQ("node=1,21 parent=0,1 view=null", nodes[1].ToString());
   EXPECT_EQ("node=1,3 parent=1,21 view=null", nodes[2].ToString());
 }
 
 // Verifies DeleteNode works.
 TEST_F(ViewManagerConnectionTest, DeleteNode) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   EstablishSecondConnection();
   EXPECT_TRUE(client2_.GetAndClearChanges().empty());
 
   // Make 2 a child of 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(client_.id(), 1),
                         CreateNodeId(client_.id(), 2),
                         1));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 2", changes[0]);
   }
 
   // Add 1 to the root
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 1),
                         2));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ(
         "HierarchyChanged change_id=2 node=1,1 new_parent=0,1 old_parent=null",
         changes[0]);
   }
 
   // Delete 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(DeleteNode(view_manager_.get(), CreateNodeId(client_.id(), 1)));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_TRUE(changes.empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=3 node=1,1", changes[0]);
   }
 }
@@ skipping 15 matching lines @@
 // Verifies if a node was deleted and then reused that other clients are
 // properly notified.
 TEST_F(ViewManagerConnectionTest, ReusedDeletedId) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
   EstablishSecondConnection();
 
   // Make 1 a child of the root.
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 1),
                         1));
     EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes = client2_.GetAndClearChanges();
     EXPECT_EQ(
         "HierarchyChanged change_id=1 node=1,1 new_parent=0,1 old_parent=null",
         changes[0]);
     const std::vector<TestNode>& nodes(client2_.hierarchy_changed_nodes());
     ASSERT_EQ(1u, nodes.size());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[0].ToString());
   }
 
   // Delete 1.
   {
-    AllocationScope scope;
     ASSERT_TRUE(DeleteNode(view_manager_.get(), CreateNodeId(client_.id(), 1)));
     EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes = client2_.GetAndClearChanges();
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=2 node=1,1", changes[0]);
   }
 
   // Create 1 again, and add it back to the root. Should get the same
   // notification.
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   {
-    AllocationScope scope;
     ASSERT_TRUE(AddNode(view_manager_.get(),
                         CreateNodeId(0, 1),
                         CreateNodeId(client_.id(), 1),
                         3));
     EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes = client2_.GetAndClearChanges();
     EXPECT_EQ(
         "HierarchyChanged change_id=3 node=1,1 new_parent=0,1 old_parent=null",
@@ skipping 181 matching lines @@
                       4));
 
   // Attach view to node 11 in the first connection.
   ASSERT_TRUE(CreateView(view_manager_.get(), 1, 51));
   ASSERT_TRUE(SetView(view_manager_.get(),
                       CreateNodeId(client_.id(), 11),
                       CreateViewId(client_.id(), 51)));
 
   // Verifies GetNodeTree() on the root.
   {
-    AllocationScope scope;
     std::vector<TestNode> nodes;
     GetNodeTree(view_manager2_.get(), CreateNodeId(0, 1), &nodes);
     ASSERT_EQ(5u, nodes.size());
     EXPECT_EQ("node=0,1 parent=null view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[1].ToString());
     EXPECT_EQ("node=1,11 parent=1,1 view=1,51", nodes[2].ToString());
     EXPECT_EQ("node=2,2 parent=0,1 view=null", nodes[3].ToString());
     EXPECT_EQ("node=2,3 parent=0,1 view=null", nodes[4].ToString());
   }
 
   // Verifies GetNodeTree() on the node 1,1.
   {
-    AllocationScope scope;
     std::vector<TestNode> nodes;
     GetNodeTree(view_manager2_.get(), CreateNodeId(1, 1), &nodes);
     ASSERT_EQ(2u, nodes.size());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,11 parent=1,1 view=1,51", nodes[1].ToString());
   }
 }
 
 TEST_F(ViewManagerConnectionTest, SetNodeBounds) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(AddNode(view_manager_.get(),
                       CreateNodeId(0, 1),
                       CreateNodeId(1, 1),
                       1));
   EstablishSecondConnection();
 
-  AllocationScope scope;
   ASSERT_TRUE(SetNodeBounds(view_manager_.get(),
                             CreateNodeId(1, 1),
                             gfx::Rect(0, 0, 100, 100)));
 
   client2_.DoRunLoopUntilChangesCount(1);
   Changes changes(client2_.GetAndClearChanges());
   ASSERT_EQ(1u, changes.size());
   EXPECT_EQ("BoundsChanged node=1,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100",
             changes[0]);
 
@@ skipping 14 matching lines @@
   // Parent 1 to the root.
   ASSERT_TRUE(AddNode(view_manager_.get(),
                       CreateNodeId(0, 1),
                       CreateNodeId(client_.id(), 1),
                       1));
 
   // Establish the second connection and give it the roots 1 and 3.
   EstablishSecondConnection();
   client2_.ClearId();
   {
-    AllocationScope scope;
     std::vector<uint32_t> roots;
     roots.push_back(CreateNodeId(1, 1));
     roots.push_back(CreateNodeId(1, 3));
     ASSERT_TRUE(SetRoots(view_manager_.get(), 2, roots));
     client2_.DoRunLoopUntilChangesCount(1);
     Changes changes(client2_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("OnConnectionEstablished", changes[0]);
     ASSERT_NE(0u, client2_.id());
     const std::vector<TestNode>& nodes(client2_.initial_nodes());
@@ skipping 120 matching lines @@
                       CreateNodeId(client2_.id(), 10),
                       CreateNodeId(client2_.id(), 11),
                       3));
   // Remove 11 from 10.
   ASSERT_TRUE(RemoveNodeFromParent(view_manager2_.get(),
                                    CreateNodeId(2, 11),
                                    4));
 
   // Verify nothing was actually removed.
   {
-    AllocationScope scope;
     std::vector<TestNode> nodes;
     GetNodeTree(view_manager_.get(), CreateNodeId(0, 1), &nodes);
     ASSERT_EQ(3u, nodes.size());
     EXPECT_EQ("node=0,1 parent=null view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[1].ToString());
     EXPECT_EQ("node=1,2 parent=0,1 view=null", nodes[2].ToString());
   }
 }
 
 // Verify SetView fails for nodes that are not descendants of the roots.
@@ skipping 40 matching lines @@
                       1));
   ASSERT_TRUE(AddNode(view_manager_.get(),
                       CreateNodeId(0, 1),
                       CreateNodeId(client_.id(), 2),
                       2));
 
   // Establish the second connection and give it the root 1.
   ASSERT_NO_FATAL_FAILURE(
       EstablishSecondConnectionWithRoot(CreateNodeId(1, 1)));
 
-  AllocationScope scope;
   std::vector<TestNode> nodes;
 
   // Should get nothing for the root.
   GetNodeTree(view_manager2_.get(), CreateNodeId(0, 1), &nodes);
   ASSERT_TRUE(nodes.empty());
 
   // Should get nothing for node 2.
   GetNodeTree(view_manager2_.get(), CreateNodeId(1, 2), &nodes);
   ASSERT_TRUE(nodes.empty());
 
   // Should get node 1 if asked for.
   GetNodeTree(view_manager2_.get(), CreateNodeId(1, 1), &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_EQ("node=1,1 parent=null view=null", nodes[0].ToString());
 }
 
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification (or advanced server id).
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo