Add EmbedRoot to ViewManagerService.

mojo/services/window_manager/window_manager_api_unittest.cc

Index: mojo/services/window_manager/window_manager_api_unittest.cc
diff --git a/mojo/services/window_manager/window_manager_api_unittest.cc b/mojo/services/window_manager/window_manager_api_unittest.cc
index 387b8af5e509786cbfe2d42bd18fa7208b36f85e..7f81819b429d4af23bf3c659a14016bb3a144aa1 100644
--- a/mojo/services/window_manager/window_manager_api_unittest.cc
+++ b/mojo/services/window_manager/window_manager_api_unittest.cc
@@ -23,8 +23,8 @@ const char kTestServiceURL[] = "mojo:test_url";
 
 void EmptyResultCallback(bool result) {}
 
-// Callback from EmbedRoot(). |result| is the result of the
-// Embed() call and |run_loop| the nested RunLoop.
+// Callback from Embed(). |result| is the result of the Embed() call and
+// |run_loop| the nested RunLoop.
 void ResultCallback(bool* result_cache, base::RunLoop* run_loop, bool result) {
   *result_cache = result;
   run_loop->Quit();
@@ -32,12 +32,12 @@ void ResultCallback(bool* result_cache, base::RunLoop* run_loop, bool result) {
 
 // Responsible for establishing the initial ViewManagerService connection.
 // Blocks until result is determined.
-bool EmbedRoot(view_manager::ViewManagerInitService* view_manager_init,
+bool InitEmbed(view_manager::ViewManagerInitService* view_manager_init,
                const std::string& url) {
   bool result = false;
   base::RunLoop run_loop;
-  view_manager_init->EmbedRoot(url,
-                               base::Bind(&ResultCallback, &result, &run_loop));
+  view_manager_init->Embed(url,
+                           base::Bind(&ResultCallback, &result, &run_loop));
   run_loop.Run();
   return result;
 }
@@ -217,7 +217,7 @@ class WindowManagerApiTest : public testing::Test {
     test_helper_.service_manager()->ConnectToService(
         GURL("mojo:mojo_view_manager"),
         &view_manager_init_);
-    ASSERT_TRUE(EmbedRoot(view_manager_init_.get(),
+    ASSERT_TRUE(InitEmbed(view_manager_init_.get(),
                           "mojo:mojo_core_window_manager"));
     ConnectToWindowManager();
   }