Changes around how embed roots are set

components/html_viewer/html_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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
@@ skipping 212 matching lines @@
       return false;
 
     frame_tree_delegate_->clear_got_navigate();
     return frame_tree_delegate_->WaitForNavigateFrame();
   }
 
   // ViewManagerTest:
   void SetUp() override {
     ViewManagerTestBase::SetUp();
 
-    // Make it so we get OnEmbedForDescendant().
-    window_manager()->SetEmbedRoot();
-
     // Start a test server.
     http_server_.reset(new net::SpawnedTestServer(
         net::SpawnedTestServer::TYPE_HTTP, net::SpawnedTestServer::kLocalhost,
         base::FilePath(FILE_PATH_LITERAL("components/test/data/html_viewer"))));
     ASSERT_TRUE(http_server_->Start());
   }
   void TearDown() override {
     frame_tree_.reset();
     http_server_.reset();
     ViewManagerTestBase::TearDown();
@@ skipping 227 matching lines @@
         script_value_as_list->GetString(0u, &message_in_child);
       }
     }
   } while (message_in_child != "hello from parent" &&
            base::TimeTicks::Now() - start_time <
                TestTimeouts::action_timeout());
   EXPECT_EQ("hello from parent", message_in_child);
 }
 
 }  // namespace mojo