Changes around how embed roots are set

components/view_manager/view_manager_client_apptest.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 "base/logging.h"
 #include "components/view_manager/public/cpp/tests/view_manager_test_base.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "components/view_manager/public/cpp/view_tree_connection.h"
 #include "components/view_manager/public/cpp/view_tree_delegate.h"
 #include "mojo/application/public/cpp/application_connection.h"
@@ skipping 674 matching lines @@
   EXPECT_TRUE(DoRunLoopWithTimeout());
   EXPECT_TRUE(got_destroy);
 }
 
 // Verifies an embed root sees views created beneath it from another
 // connection.
 TEST_F(ViewManagerTest, EmbedRootSeesHierarchyChanged) {
   View* embed_view = window_manager()->CreateView();
   window_manager()->GetRoot()->AddChild(embed_view);
 
+  embed_view->SetAccessPolicy(ViewTree::kAccessPolicyEmbedRoot);
   ViewTreeConnection* vm2 = Embed(embed_view);
-  vm2->SetEmbedRoot();
   View* vm2_v1 = vm2->CreateView();
   vm2->GetRoot()->AddChild(vm2_v1);
 
   ViewTreeConnection* vm3 = Embed(vm2_v1);
   View* vm3_v1 = vm3->CreateView();
   vm3->GetRoot()->AddChild(vm3_v1);
 
   // As |vm2| is an embed root it should get notified about |vm3_v1|.
   ASSERT_TRUE(WaitForTreeSizeToMatch(vm2_v1, 2));
 }
 
 TEST_F(ViewManagerTest, EmbedFromEmbedRoot) {
   View* embed_view = window_manager()->CreateView();
   window_manager()->GetRoot()->AddChild(embed_view);
 
+  embed_view->SetAccessPolicy(ViewTree::kAccessPolicyEmbedRoot);
   ViewTreeConnection* vm2 = Embed(embed_view);
-  vm2->SetEmbedRoot();
   View* vm2_v1 = vm2->CreateView();
   vm2->GetRoot()->AddChild(vm2_v1);
 
   ViewTreeConnection* vm3 = Embed(vm2_v1);
   View* vm3_v1 = vm3->CreateView();
   vm3->GetRoot()->AddChild(vm3_v1);
 
   // As |vm2| is an embed root it should get notified about |vm3_v1|.
   ASSERT_TRUE(WaitForTreeSizeToMatch(vm2_v1, 2));
 
   // Embed() from vm2 in vm3_v1. This is allowed as vm2 is an embed root.
   ASSERT_EQ(1u, vm2_v1->children().size());
   View* vm3_v1_in_vm2 = vm2_v1->children()[0];
   ASSERT_TRUE(Embed(vm3_v1_in_vm2));
 }
 
 }  // namespace mojo