Restricts node/view deletion to creator

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 87 matching lines @@
 bool CreateNode(IViewManager* view_manager,
                 TransportConnectionId connection_id,
                 TransportConnectionSpecificNodeId node_id) {
   bool result = false;
   view_manager->CreateNode(CreateNodeId(connection_id, node_id),
                            base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
-// Deletes a node, blocking until done.
+// Deletes a view, blocking until done.
 bool DeleteNode(IViewManager* view_manager, TransportNodeId node_id) {
   bool result = false;
   view_manager->DeleteNode(node_id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
+// Deletes a node, blocking until done.
+bool DeleteView(IViewManager* view_manager, TransportViewId view_id) {
+  bool result = false;
+  view_manager->DeleteView(view_id, 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) {
   bool result = false;
   view_manager->AddNode(parent, child, server_change_id,
                         base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
@@ skipping 670 matching lines @@
     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]);
   }
 }
 
+// Verifies DeleteNode isn't allowed from a separate connection.
+TEST_F(ViewManagerConnectionTest, DeleteNodeFromAnotherConnectionDisallowed) {
+  ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
+  EstablishSecondConnection();
+  EXPECT_FALSE(DeleteNode(view_manager2_.get(), CreateNodeId(client_.id(), 1)));
+}
+
+// Verifies DeleteView isn't allowed from a separate connection.
+TEST_F(ViewManagerConnectionTest, DeleteViewFromAnotherConnectionDisallowed) {
+  ASSERT_TRUE(CreateView(view_manager_.get(), 1, 1));
+  EstablishSecondConnection();
+  EXPECT_FALSE(DeleteView(view_manager2_.get(), CreateViewId(client_.id(), 1)));
+}
+
 // 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.
   {
@@ skipping 248 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 service
 }  // namespace view_manager
 }  // namespace mojo