Revert 269414 "Changes to deletion/ownership of nodes in the cli..."

trunk/src/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"
@@ skipping 205 matching lines @@
                                   TransportViewId old_view_id,
                                   TransportChangeId change_id) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "change_id=%d node=%s new_view=%s old_view=%s",
             static_cast<int>(change_id), NodeIdToString(node).c_str(),
             NodeIdToString(new_view_id).c_str(),
             NodeIdToString(old_view_id).c_str()));
     QuitIfNecessary();
   }
-  virtual void OnNodeDeleted(TransportNodeId node,
-                             TransportChangeId change_id) OVERRIDE {
-    changes_.push_back(
-        base::StringPrintf(
-            "change_id=%d node=%s deleted",
-            static_cast<int>(change_id), NodeIdToString(node).c_str()));
-    QuitIfNecessary();
-  }
 
   void QuitIfNecessary() {
     if (quit_count_ > 0 && --quit_count_ == 0)
       current_run_loop->Quit();
   }
 
   TransportConnectionId id_;
 
   // Used to determine when/if to quit the run loop.
   size_t quit_count_;
@@ skipping 202 matching lines @@
               changes[0]);
   }
 
   // Delete 1.
   {
     AllocationScope scope;
     ASSERT_TRUE(DeleteNode(view_manager_.get(),
                            CreateNodeId(client_.id(), 1),
                            121));
     Changes changes(client_.GetAndClearChanges());
-    ASSERT_EQ(3u, changes.size());
+    ASSERT_EQ(2u, changes.size());
     EXPECT_EQ("change_id=121 node=1,1 new_parent=null old_parent=0,1",
               changes[0]);
     EXPECT_EQ("change_id=121 node=1,2 new_parent=null old_parent=1,1",
               changes[1]);
-    EXPECT_EQ("change_id=121 node=1,1 deleted", changes[2]);
   }
 }
 
 // Assertions around setting a view.
 TEST_F(ViewManagerConnectionTest, SetView) {
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 2));
   ASSERT_TRUE(CreateView(view_manager_.get(), 11));
   EXPECT_TRUE(client_.GetAndClearChanges().empty());
 
@@ skipping 37 matching lines @@
                       CreateViewId(client_.id(), 11),
                       21));
   client_.GetAndClearChanges();
 
   // Delete node 1.
   {
     ASSERT_TRUE(DeleteNode(view_manager_.get(),
                            CreateNodeId(client_.id(), 1),
                            121));
     Changes changes(client_.GetAndClearChanges());
-    ASSERT_EQ(2u, changes.size());
+    ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("change_id=121 node=1,1 new_view=null old_view=1,11",
               changes[0]);
-    EXPECT_EQ("change_id=121 node=1,1 deleted", changes[1]);
   }
 
   // Set view 11 on node 2.
   {
     ASSERT_TRUE(SetView(view_manager_.get(),
                         CreateNodeId(client_.id(), 2),
                         CreateViewId(client_.id(), 11),
                         22));
     Changes changes(client_.GetAndClearChanges());
     ASSERT_EQ(1u, changes.size());
@@ skipping 98 matching lines @@
     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());
   }
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo