Adds Embed() variant to ViewManagerService that takes ViewManagerClient

services/view_manager/view_manager_service_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 <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
@@ skipping 134 matching lines @@
       mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
       mojo::ConnectionSpecificId creator_id,
       const std::string& creator_url,
       const std::string& url,
       const ViewId& root_id) override {
     scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
         connection_manager, creator_id, creator_url, url, root_id));
     last_connection_ = new TestClientConnection(service.Pass());
     return last_connection_;
   }
+  ClientConnection* CreateClientConnectionForEmbedAtView(
+      ConnectionManager* connection_manager,
+      mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
+      mojo::ConnectionSpecificId creator_id,
+      const std::string& creator_url,
+      const ViewId& root_id,
+      mojo::ViewManagerClientPtr client) override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
 
   TestClientConnection* last_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(TestConnectionManagerDelegate);
 };
 
 // -----------------------------------------------------------------------------
 
 // Empty implementation of DisplayManager.
 class TestDisplayManager : public DisplayManager {
@@ skipping 107 matching lines @@
 //     2,1 bounds=1,2 11x22
 //       2,2 bounds=2,3 6x7
 //         2,3 bounds=3,4 6x7
 // CloneAndAnimate() is invoked for 2,2.
 void SetUpAnimate1(ViewManagerServiceTest* test, ViewId* embed_view_id) {
   *embed_view_id = ViewId(test->wm_connection()->id(), 1);
   EXPECT_EQ(ERROR_CODE_NONE, test->wm_connection()->CreateView(*embed_view_id));
   EXPECT_TRUE(test->wm_connection()->SetViewVisibility(*embed_view_id, true));
   EXPECT_TRUE(test->wm_connection()->AddView(*(test->wm_connection()->root()),
                                              *embed_view_id));
-  test->wm_connection()->Embed(std::string(), *embed_view_id, nullptr, nullptr);
+  test->wm_connection()->EmbedUrl(std::string(), *embed_view_id, nullptr,
+                                  nullptr);
   ViewManagerServiceImpl* connection1 =
       test->connection_manager()->GetConnectionWithRoot(*embed_view_id);
   ASSERT_TRUE(connection1 != nullptr);
   ASSERT_NE(connection1, test->wm_connection());
 
   const ViewId child1(connection1->id(), 1);
   EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child1));
   const ViewId child2(connection1->id(), 2);
   EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child2));
   const ViewId child3(connection1->id(), 3);
@@ skipping 115 matching lines @@
 }
 
 // Clone and animate on a tree with more depth. Basically that of
 // SetUpAnimate1() but cloning 2,1.
 TEST_F(ViewManagerServiceTest, CloneAndAnimateLargerDepth) {
   const ViewId embed_view_id(wm_connection()->id(), 1);
   EXPECT_EQ(ERROR_CODE_NONE, wm_connection()->CreateView(embed_view_id));
   EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));
   EXPECT_TRUE(
       wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
-  wm_connection()->Embed(std::string(), embed_view_id, nullptr, nullptr);
+  wm_connection()->EmbedUrl(std::string(), embed_view_id, nullptr, nullptr);
   ViewManagerServiceImpl* connection1 =
       connection_manager()->GetConnectionWithRoot(embed_view_id);
   ASSERT_TRUE(connection1 != nullptr);
   ASSERT_NE(connection1, wm_connection());
 
   const ViewId child1(connection1->id(), 1);
   EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child1));
   const ViewId child2(connection1->id(), 2);
   EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child2));
   const ViewId child3(connection1->id(), 3);
@@ skipping 19 matching lines @@
   const ServerView* cloned_view = GetFirstCloned(v1->parent());
   ASSERT_TRUE(cloned_view);
   // |cloned_view| should have a child and its child should have a child.
   ASSERT_EQ(1u, cloned_view->GetChildren().size());
   const ServerView* cloned_view_child = cloned_view->GetChildren()[0];
   EXPECT_EQ(1u, cloned_view_child->GetChildren().size());
   EXPECT_TRUE(cloned_view_child->id() == ClonedViewId());
 }
 
 }  // namespace view_manager