Client side name cleanup

mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

Index: mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
index f52687925ebc058a22ad6508ff98ef83c17875c5..d9e152ba2997e430f8d7ffd25b532a85086904e6 100644
--- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
+++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
@@ -9,13 +9,13 @@
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/service_manager/service_manager.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
+#include "mojo/services/public/cpp/view_manager/lib/node_private.h"
+#include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
+#include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
-#include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -39,16 +39,16 @@ void QuitRunLoop() {
   current_run_loop->Quit();
 }
 
-void WaitForAllChangesToBeAcked(ViewManagerSynchronizer* synchronizer) {
-  synchronizer->set_changes_acked_callback(base::Bind(&QuitRunLoop));
+void WaitForAllChangesToBeAcked(ViewManagerClientImpl* client) {
+  client->set_changes_acked_callback(base::Bind(&QuitRunLoop));
   DoRunLoop();
-  synchronizer->ClearChangesAckedCallback();
+  client->ClearChangesAckedCallback();
 }
 
 class ConnectServiceLoader : public ServiceLoader,
                              public ViewManagerDelegate {
  public:
-  typedef base::Callback<void(ViewManager*, ViewTreeNode*)> LoadedCallback;
+  typedef base::Callback<void(ViewManager*, Node*)> LoadedCallback;
 
   explicit ConnectServiceLoader(const LoadedCallback& callback)
       : callback_(callback) {
@@ -70,7 +70,7 @@ class ConnectServiceLoader : public ServiceLoader,
 
   // Overridden from ViewManagerDelegate:
   virtual void OnRootAdded(ViewManager* view_manager,
-                           ViewTreeNode* root) OVERRIDE {
+                           Node* root) OVERRIDE {
     callback_.Run(view_manager, root);
   }
 
@@ -80,15 +80,15 @@ class ConnectServiceLoader : public ServiceLoader,
   DISALLOW_COPY_AND_ASSIGN(ConnectServiceLoader);
 };
 
-class ActiveViewChangedObserver : public ViewTreeNodeObserver {
+class ActiveViewChangedObserver : public NodeObserver {
  public:
-  explicit ActiveViewChangedObserver(ViewTreeNode* node)
+  explicit ActiveViewChangedObserver(Node* node)
       : node_(node) {}
   virtual ~ActiveViewChangedObserver() {}
 
  private:
-  // Overridden from ViewTreeNodeObserver:
-  virtual void OnNodeActiveViewChange(ViewTreeNode* node,
+  // Overridden from NodeObserver:
+  virtual void OnNodeActiveViewChange(Node* node,
                                       View* old_view,
                                       View* new_view,
                                       DispositionChangePhase phase) OVERRIDE {
@@ -96,43 +96,43 @@ class ActiveViewChangedObserver : public ViewTreeNodeObserver {
     QuitRunLoop();
   }
 
-  ViewTreeNode* node_;
+  Node* node_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveViewChangedObserver);
 };
 
 // Waits until the active view id of the supplied node changes.
-void WaitForActiveViewToChange(ViewTreeNode* node) {
+void WaitForActiveViewToChange(Node* node) {
   ActiveViewChangedObserver observer(node);
   node->AddObserver(&observer);
   DoRunLoop();
   node->RemoveObserver(&observer);
 }
 
-class BoundsChangeObserver : public ViewTreeNodeObserver {
+class BoundsChangeObserver : public NodeObserver {
  public:
-  explicit BoundsChangeObserver(ViewTreeNode* node) : node_(node) {}
+  explicit BoundsChangeObserver(Node* node) : node_(node) {}
   virtual ~BoundsChangeObserver() {}
 
  private:
-  // Overridden from ViewTreeNodeObserver:
-  virtual void OnNodeBoundsChange(ViewTreeNode* node,
+  // Overridden from NodeObserver:
+  virtual void OnNodeBoundsChange(Node* node,
                                   const gfx::Rect& old_bounds,
                                   const gfx::Rect& new_bounds,
                                   DispositionChangePhase phase) OVERRIDE {
     DCHECK_EQ(node, node_);
-    if (phase != ViewTreeNodeObserver::DISPOSITION_CHANGED)
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
       return;
     QuitRunLoop();
   }
 
-  ViewTreeNode* node_;
+  Node* node_;
 
   DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
 };
 
 // Wait until the bounds of the supplied node change.
-void WaitForBoundsToChange(ViewTreeNode* node) {
+void WaitForBoundsToChange(Node* node) {
   BoundsChangeObserver observer(node);
   node->AddObserver(&observer);
   DoRunLoop();
@@ -141,9 +141,9 @@ void WaitForBoundsToChange(ViewTreeNode* node) {
 
 // Spins a runloop until the tree beginning at |root| has |tree_size| nodes
 // (including |root|).
-class TreeSizeMatchesObserver : public ViewTreeNodeObserver {
+class TreeSizeMatchesObserver : public NodeObserver {
  public:
-  TreeSizeMatchesObserver(ViewTreeNode* tree, size_t tree_size)
+  TreeSizeMatchesObserver(Node* tree, size_t tree_size)
       : tree_(tree),
         tree_size_(tree_size) {}
   virtual ~TreeSizeMatchesObserver() {}
@@ -153,27 +153,27 @@ class TreeSizeMatchesObserver : public ViewTreeNodeObserver {
   }
 
  private:
-  // Overridden from ViewTreeNodeObserver:
+  // Overridden from NodeObserver:
   virtual void OnTreeChange(const TreeChangeParams& params) OVERRIDE {
     if (IsTreeCorrectSize())
       QuitRunLoop();
   }
 
-  size_t CountNodes(const ViewTreeNode* node) const {
+  size_t CountNodes(const Node* node) const {
     size_t count = 1;
-    ViewTreeNode::Children::const_iterator it = node->children().begin();
+    Node::Children::const_iterator it = node->children().begin();
     for (; it != node->children().end(); ++it)
       count += CountNodes(*it);
     return count;
   }
 
-  ViewTreeNode* tree_;
+  Node* tree_;
   size_t tree_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeSizeMatchesObserver);
 };
 
-void WaitForTreeSizeToMatch(ViewTreeNode* node, size_t tree_size) {
+void WaitForTreeSizeToMatch(Node* node, size_t tree_size) {
   TreeSizeMatchesObserver observer(node, tree_size);
   if (observer.IsTreeCorrectSize())
     return;
@@ -185,8 +185,7 @@ void WaitForTreeSizeToMatch(ViewTreeNode* node, size_t tree_size) {
 
 // Utility class that waits for the destruction of some number of nodes and
 // views.
-class DestructionObserver : public ViewTreeNodeObserver,
-                            public ViewObserver {
+class DestructionObserver : public NodeObserver, public ViewObserver {
  public:
   // |nodes| or |views| can be NULL.
   DestructionObserver(std::set<Id>* nodes, std::set<Id>* views)
@@ -194,11 +193,11 @@ class DestructionObserver : public ViewTreeNodeObserver,
         views_(views) {}
 
  private:
-  // Overridden from ViewTreeNodeObserver:
+  // Overridden from NodeObserver:
   virtual void OnNodeDestroy(
-      ViewTreeNode* node,
-      ViewTreeNodeObserver::DispositionChangePhase phase) OVERRIDE {
-    if (phase != ViewTreeNodeObserver::DISPOSITION_CHANGED)
+      Node* node,
+      NodeObserver::DispositionChangePhase phase) OVERRIDE {
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
       return;
     std::set<Id>::const_iterator it = nodes_->find(node->id());
     if (it != nodes_->end())
@@ -250,9 +249,9 @@ void WaitForDestruction(ViewManager* view_manager,
   DoRunLoop();
 }
 
-class OrderChangeObserver : public ViewTreeNodeObserver {
+class OrderChangeObserver : public NodeObserver {
  public:
-  OrderChangeObserver(ViewTreeNode* node) : node_(node) {
+  OrderChangeObserver(Node* node) : node_(node) {
     node_->AddObserver(this);
   }
   virtual ~OrderChangeObserver() {
@@ -260,33 +259,32 @@ class OrderChangeObserver : public ViewTreeNodeObserver {
   }
 
  private:
-  // Overridden from ViewTreeNodeObserver:
-  virtual void OnNodeReordered(ViewTreeNode* node,
-                               ViewTreeNode* relative_node,
+  // Overridden from NodeObserver:
+  virtual void OnNodeReordered(Node* node,
+                               Node* relative_node,
                                OrderDirection direction,
                                DispositionChangePhase phase) OVERRIDE {
-    if (phase != ViewTreeNodeObserver::DISPOSITION_CHANGED)
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
       return;
 
     DCHECK_EQ(node, node_);
     QuitRunLoop();
   }
 
-  ViewTreeNode* node_;
+  Node* node_;
 
   DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
 };
 
-void WaitForOrderChange(ViewManager* view_manager,
-                        ViewTreeNode* node) {
+void WaitForOrderChange(ViewManager* view_manager, Node* node) {
   OrderChangeObserver observer(node);
   DoRunLoop();
 }
 
 // Tracks a node's destruction. Query is_valid() for current state.
-class NodeTracker : public ViewTreeNodeObserver {
+class NodeTracker : public NodeObserver {
  public:
-  explicit NodeTracker(ViewTreeNode* node) : node_(node) {
+  explicit NodeTracker(Node* node) : node_(node) {
     node_->AddObserver(this);
   }
   virtual ~NodeTracker() {
@@ -297,18 +295,18 @@ class NodeTracker : public ViewTreeNodeObserver {
   bool is_valid() const { return !!node_; }
 
  private:
-  // Overridden from ViewTreeNodeObserver:
+  // Overridden from NodeObserver:
   virtual void OnNodeDestroy(
-      ViewTreeNode* node,
-      ViewTreeNodeObserver::DispositionChangePhase phase) OVERRIDE {
-    if (phase != ViewTreeNodeObserver::DISPOSITION_CHANGED)
+      Node* node,
+      NodeObserver::DispositionChangePhase phase) OVERRIDE {
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
       return;
     DCHECK_EQ(node, node_);
     node_ = NULL;
   }
 
   int id_;
-  ViewTreeNode* node_;
+  Node* node_;
 
   DISALLOW_COPY_AND_ASSIGN(NodeTracker);
 };
@@ -331,16 +329,16 @@ class ViewManagerTest : public testing::Test {
  protected:
   ViewManager* window_manager() { return window_manager_; }
 
-  ViewTreeNode* CreateNodeInParent(ViewTreeNode* parent) {
-    ViewManager* parent_manager = ViewTreeNodePrivate(parent).view_manager();
-    ViewTreeNode* node = ViewTreeNode::Create(parent_manager);
+  Node* CreateNodeInParent(Node* parent) {
+    ViewManager* parent_manager = NodePrivate(parent).view_manager();
+    Node* node = Node::Create(parent_manager);
     parent->AddChild(node);
     return node;
   }
 
   // Embeds another version of the test app @ node.
-  ViewManager* Embed(ViewManager* view_manager, ViewTreeNode* node) {
-    DCHECK_EQ(view_manager, ViewTreeNodePrivate(node).view_manager());
+  ViewManager* Embed(ViewManager* view_manager, Node* node) {
+    DCHECK_EQ(view_manager, NodePrivate(node).view_manager());
     node->Embed(kEmbeddedApp1URL);
     RunRunLoop();
     return GetLoadedViewManager();
@@ -397,7 +395,7 @@ class ViewManagerTest : public testing::Test {
     return result;
   }
 
-  void OnViewManagerLoaded(ViewManager* view_manager, ViewTreeNode* root) {
+  void OnViewManagerLoaded(ViewManager* view_manager, Node* root) {
     loaded_view_manager_ = view_manager;
     connect_loop_->Quit();
   }
@@ -426,12 +424,12 @@ class ViewManagerTest : public testing::Test {
 TEST_F(ViewManagerTest, SetUp) {}
 
 TEST_F(ViewManagerTest, Embed) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
   EXPECT_TRUE(NULL != embedded);
 
-  ViewTreeNode* node_in_embedded = embedded->GetRoots().front();
+  Node* node_in_embedded = embedded->GetRoots().front();
   EXPECT_EQ(node->parent(), window_manager()->GetRoots().front());
   EXPECT_EQ(NULL, node_in_embedded->parent());
 }
@@ -440,10 +438,10 @@ TEST_F(ViewManagerTest, Embed) {
 // visible to A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, HierarchyChanged_NodeAdded) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
-  ViewTreeNode* nested = ViewTreeNode::Create(window_manager());
+  Node* nested = Node::Create(window_manager());
   node->AddChild(nested);
   WaitForTreeSizeToMatch(embedded->GetRoots().front(), 2);
   EXPECT_EQ(embedded->GetRoots().front()->children().front()->id(),
@@ -454,17 +452,17 @@ TEST_F(ViewManagerTest, HierarchyChanged_NodeAdded) {
 // a child of N2. Reparents N2 to N1. N1 should become visible to A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, HierarchyChanged_NodeMoved) {
-  ViewTreeNode* node1 = ViewTreeNode::Create(window_manager());
+  Node* node1 = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node1);
   ViewManager* embedded = Embed(window_manager(), node1);
   WaitForTreeSizeToMatch(embedded->GetRoots().front(), 1);
 
-  ViewTreeNode* node2 = ViewTreeNode::Create(window_manager());
+  Node* node2 = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node2);
   WaitForTreeSizeToMatch(embedded->GetRoots().front(), 1);
   EXPECT_TRUE(embedded->GetRoots().front()->children().empty());
 
-  ViewTreeNode* node21 = ViewTreeNode::Create(window_manager());
+  Node* node21 = Node::Create(window_manager());
   node2->AddChild(node21);
   WaitForTreeSizeToMatch(embedded->GetRoots().front(), 1);
   EXPECT_TRUE(embedded->GetRoots().front()->children().empty());
@@ -481,9 +479,9 @@ TEST_F(ViewManagerTest, HierarchyChanged_NodeMoved) {
 // N1. N11 should disappear from A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, HierarchyChanged_NodeRemoved) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
-  ViewTreeNode* nested = ViewTreeNode::Create(window_manager());
+  Node* nested = Node::Create(window_manager());
   node->AddChild(nested);
 
   ViewManager* embedded = Embed(window_manager(), node);
@@ -499,9 +497,9 @@ TEST_F(ViewManagerTest, HierarchyChanged_NodeRemoved) {
 // N11 should disappear from A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, NodeDestroyed) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
-  ViewTreeNode* nested = ViewTreeNode::Create(window_manager());
+  Node* nested = Node::Create(window_manager());
   node->AddChild(nested);
 
   ViewManager* embedded = Embed(window_manager(), node);
@@ -521,7 +519,7 @@ TEST_F(ViewManagerTest, NodeDestroyed) {
 }
 
 TEST_F(ViewManagerTest, ViewManagerDestroyed_CleanupNode) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
@@ -537,28 +535,28 @@ TEST_F(ViewManagerTest, ViewManagerDestroyed_CleanupNode) {
 }
 
 TEST_F(ViewManagerTest, SetActiveView) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   View* view = View::Create(window_manager());
   node->SetActiveView(view);
 
-  ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
+  Node* node_in_embedded = embedded->GetNodeById(node->id());
   WaitForActiveViewToChange(node_in_embedded);
 
   EXPECT_EQ(node_in_embedded->active_view()->id(), view->id());
 }
 
 TEST_F(ViewManagerTest, DestroyView) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   View* view = View::Create(window_manager());
   node->SetActiveView(view);
 
-  ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
+  Node* node_in_embedded = embedded->GetNodeById(node->id());
   WaitForActiveViewToChange(node_in_embedded);
 
   EXPECT_EQ(node_in_embedded->active_view()->id(), view->id());
@@ -576,7 +574,7 @@ TEST_F(ViewManagerTest, DestroyView) {
 // Destroying the connection that created a node and view should result in that
 // node and view disappearing from all connections that see them.
 TEST_F(ViewManagerTest, ViewManagerDestroyed_CleanupNodeAndView) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   View* view = View::Create(window_manager());
   node->SetActiveView(view);
@@ -606,11 +604,11 @@ TEST_F(ViewManagerTest, ViewManagerDestroyed_CleanupNodeAndView) {
 //    should be disconnected from any nodes.
 TEST_F(ViewManagerTest,
        ViewManagerDestroyed_CleanupNodeAndViewFromDifferentConnections) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
   View* view_in_embedded = View::Create(embedded);
-  ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
+  Node* node_in_embedded = embedded->GetNodeById(node->id());
   node_in_embedded->SetActiveView(view_in_embedded);
 
   WaitForActiveViewToChange(node);
@@ -634,10 +632,10 @@ TEST_F(ViewManagerTest,
 
 // This test verifies that it is not possible to set the active view to a view
 // defined in a different connection.
-// TODO(beng): write these tests for ViewTreeNode::AddChild(), RemoveChild() and
+// TODO(beng): write these tests for Node::AddChild(), RemoveChild() and
 //             Contains().
 TEST_F(ViewManagerTest, SetActiveViewAcrossConnection) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
@@ -649,27 +647,27 @@ TEST_F(ViewManagerTest, SetActiveViewAcrossConnection) {
 // becomes entirely visible to the second connection when the hierarchy is
 // attached.
 TEST_F(ViewManagerTest, MapSubtreeOnAttach) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  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.
-  ViewTreeNode* child1 = ViewTreeNode::Create(window_manager());
-  ViewTreeNode* child11 = ViewTreeNode::Create(window_manager());
+  Node* child1 = Node::Create(window_manager());
+  Node* child11 = Node::Create(window_manager());
   child1->AddChild(child11);
   gfx::Rect child11_bounds(800, 600);
   child11->SetBounds(child11_bounds);
   View* view11 = View::Create(window_manager());
   child11->SetActiveView(view11);
   WaitForAllChangesToBeAcked(
-      static_cast<ViewManagerSynchronizer*>(window_manager()));
+      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);
 
-  ViewTreeNode* child11_in_embedded = embedded->GetNodeById(child11->id());
+  Node* child11_in_embedded = embedded->GetNodeById(child11->id());
   View* view11_in_embedded = embedded->GetViewById(view11->id());
   EXPECT_TRUE(child11_in_embedded != NULL);
   EXPECT_EQ(view11_in_embedded, child11_in_embedded->active_view());
@@ -679,11 +677,11 @@ TEST_F(ViewManagerTest, MapSubtreeOnAttach) {
 // Verifies that bounds changes applied to a node hierarchy in one connection
 // are reflected to another.
 TEST_F(ViewManagerTest, SetBounds) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
-  ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
+  Node* node_in_embedded = embedded->GetNodeById(node->id());
   EXPECT_EQ(node->bounds(), node_in_embedded->bounds());
 
   node->SetBounds(gfx::Rect(100, 100));
@@ -695,11 +693,11 @@ TEST_F(ViewManagerTest, SetBounds) {
 // Verifies that bounds changes applied to a node owned by a different
 // connection are refused.
 TEST_F(ViewManagerTest, SetBoundsSecurity) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
-  ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
+  Node* node_in_embedded = embedded->GetNodeById(node->id());
   node->SetBounds(gfx::Rect(800, 600));
   WaitForBoundsToChange(node_in_embedded);
 
@@ -710,11 +708,11 @@ TEST_F(ViewManagerTest, SetBoundsSecurity) {
 
 // Verifies that a node can only be destroyed by the connection that created it.
 TEST_F(ViewManagerTest, DestroySecurity) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  Node* node = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
-  ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
+  Node* node_in_embedded = embedded->GetNodeById(node->id());
 
   NodeTracker tracker2(node_in_embedded);
   node_in_embedded->Destroy();
@@ -727,9 +725,9 @@ TEST_F(ViewManagerTest, DestroySecurity) {
 }
 
 TEST_F(ViewManagerTest, MultiRoots) {
-  ViewTreeNode* node1 = ViewTreeNode::Create(window_manager());
+  Node* node1 = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node1);
-  ViewTreeNode* node2 = ViewTreeNode::Create(window_manager());
+  Node* node2 = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node2);
   ViewManager* embedded1 = Embed(window_manager(), node1);
   ViewManager* embedded2 = Embed(window_manager(), node2);
@@ -737,24 +735,24 @@ TEST_F(ViewManagerTest, MultiRoots) {
 }
 
 TEST_F(ViewManagerTest, EmbeddingIdentity) {
-  ViewTreeNode* node = ViewTreeNode::Create(window_manager());
+  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) {
-  ViewTreeNode* node1 = ViewTreeNode::Create(window_manager());
+  Node* node1 = Node::Create(window_manager());
   window_manager()->GetRoots().front()->AddChild(node1);
 
-  ViewTreeNode* node11 = ViewTreeNode::Create(window_manager());
+  Node* node11 = Node::Create(window_manager());
   node1->AddChild(node11);
-  ViewTreeNode* node12 = ViewTreeNode::Create(window_manager());
+  Node* node12 = Node::Create(window_manager());
   node1->AddChild(node12);
 
   ViewManager* embedded = Embed(window_manager(), node1);
 
-  ViewTreeNode* node1_in_embedded = embedded->GetNodeById(node1->id());
+  Node* node1_in_embedded = embedded->GetNodeById(node1->id());
 
   {
     node11->MoveToFront();