Adds better security checking to OnCreatedFrame()

components/web_view/frame_apptest.cc

 // Copyright 2015 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 "components/web_view/frame.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 157 matching lines @@
   FrameTreeServerPtr server_;
   mojo::Array<FrameDataPtr> adds_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFrameTreeClient);
 };
 
 // Verifies the root gets a connect.
 TEST_F(FrameTest, RootGetsConnect) {
   TestFrameTreeDelegate tree_delegate;
   TestFrameTreeClient root_client;
-  FrameTree tree(0u, window_manager()->GetRoot(), &tree_delegate, &root_client,
-                 nullptr, Frame::ClientPropertyMap());
+  FrameTree tree(0u, window_manager()->GetRoot(), nullptr, &tree_delegate,
+                 &root_client, nullptr, Frame::ClientPropertyMap());
   ASSERT_EQ(1, root_client.connect_count());
   mojo::Array<FrameDataPtr> frames = root_client.connect_frames();
   ASSERT_EQ(1u, frames.size());
   EXPECT_EQ(tree.root()->view()->id(), frames[0]->frame_id);
   EXPECT_EQ(0u, frames[0]->parent_id);
 }
 
 // Verifies adding a child to the root.
 TEST_F(FrameTest, SingleChild) {
   TestFrameTreeDelegate tree_delegate;
   TestFrameTreeClient root_client;
-  FrameTree tree(0u, window_manager()->GetRoot(), &tree_delegate, &root_client,
-                 nullptr, Frame::ClientPropertyMap());
+  FrameTree tree(0u, window_manager()->GetRoot(), nullptr, &tree_delegate,
+                 &root_client, nullptr, Frame::ClientPropertyMap());
 
   View* child = window_manager()->CreateView();
   EXPECT_EQ(nullptr, Frame::FindFirstFrameAncestor(child));
   window_manager()->GetRoot()->AddChild(child);
   EXPECT_EQ(tree.root(), Frame::FindFirstFrameAncestor(child));
 
   TestFrameTreeClient child_client;
   Frame* child_frame =
       tree.CreateAndAddFrame(child, tree.root(), 0u, &child_client, nullptr);
   EXPECT_EQ(tree.root(), child_frame->parent());
 
   ASSERT_EQ(1, child_client.connect_count());
   mojo::Array<FrameDataPtr> frames_in_child = child_client.connect_frames();
   // We expect 2 frames. One for the root, one for the child.
   ASSERT_EQ(2u, frames_in_child.size());
   EXPECT_EQ(tree.root()->view()->id(), frames_in_child[0]->frame_id);
   EXPECT_EQ(0u, frames_in_child[0]->parent_id);
   EXPECT_EQ(child_frame->view()->id(), frames_in_child[1]->frame_id);
   EXPECT_EQ(tree.root()->view()->id(), frames_in_child[1]->parent_id);
 
   // We should have gotten notification of the add.
   EXPECT_EQ(1u, root_client.adds().size());
 }
 
 }  // namespace web_view