Add EmbedRoot to ViewManagerService.

mojo/services/window_manager/window_manager_api_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 "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
 
 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();
 }
 
 // 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;
 }
 
 void OpenWindowCallback(view_manager::Id* id,
                         base::RunLoop* run_loop,
                         view_manager::Id window_id) {
   *id = window_id;
   run_loop->Quit();
 }
@@ skipping 159 matching lines @@
   virtual void SetUp() MOJO_OVERRIDE {
     test_helper_.Init();
     test_helper_.SetLoaderForURL(
         scoped_ptr<ServiceLoader>(new TestServiceLoader(
             base::Bind(&WindowManagerApiTest::OnRootAdded,
                        base::Unretained(this)))),
         GURL(kTestServiceURL));
     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();
   }
   virtual void TearDown() MOJO_OVERRIDE {}
 
   void ConnectToWindowManager() {
     test_helper_.service_manager()->ConnectToService(
         GURL("mojo:mojo_core_window_manager"),
         &window_manager_);
     base::RunLoop connect_loop;
@@ skipping 61 matching lines @@
 
   view_manager::Id second_window = OpenWindow(window_manager_.get());
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo