Removes ServiceProviders from ViewManager::Embed

components/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 "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager.h"
@@ skipping 29 matching lines @@
 class TestViewManagerClient : public mojo::ViewManagerClient {
  public:
   TestViewManagerClient() {}
   ~TestViewManagerClient() override {}
 
   TestChangeTracker* tracker() { return &tracker_; }
 
  private:
   // ViewManagerClient:
   void OnEmbed(uint16_t connection_id,
-               const String& embedder_url,
                ViewDataPtr root,
                mojo::ViewManagerServicePtr view_manager_service,
-               InterfaceRequest<ServiceProvider> services,
-               ServiceProviderPtr exposed_services,
                mojo::Id focused_view_id) override {
     // TODO(sky): add test coverage of |focused_view_id|.
-    tracker_.OnEmbed(connection_id, embedder_url, root.Pass());
+    tracker_.OnEmbed(connection_id, root.Pass());
   }
-  void OnWillEmbed(uint32_t view,
-                   mojo::InterfaceRequest<mojo::ServiceProvider> services,
-                   mojo::ServiceProviderPtr exposed_services,
-                   const OnWillEmbedCallback& callback) override {}
+  void OnEmbedForDescendant(
+      uint32_t view,
+      mojo::URLRequestPtr request,
+      const OnEmbedForDescendantCallback& callback) override {}
   void OnEmbeddedAppDisconnected(uint32_t view) override {
     tracker_.OnEmbeddedAppDisconnected(view);
   }
   void OnViewBoundsChanged(uint32_t view,
                            mojo::RectPtr old_bounds,
                            mojo::RectPtr new_bounds) override {
     tracker_.OnViewBoundsChanged(view, old_bounds.Pass(), new_bounds.Pass());
   }
   void OnViewViewportMetricsChanged(
       mojo::ViewportMetricsPtr old_metrics,
@@ skipping 70 matching lines @@
   TestClientConnection* last_connection() { return last_connection_; }
 
  private:
   // ConnectionManagerDelegate:
   void OnLostConnectionToWindowManager() override {}
 
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
       mojo::ConnectionSpecificId creator_id,
-      const std::string& creator_url,
       mojo::URLRequestPtr request,
       const ViewId& root_id) override {
-    scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
-        connection_manager, creator_id, creator_url, request->url, root_id));
+    scoped_ptr<ViewManagerServiceImpl> service(
+        new ViewManagerServiceImpl(connection_manager, creator_id, 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);
 };
@@ skipping 67 matching lines @@
   ConnectionManager* connection_manager() { return connection_manager_.get(); }
 
   TestViewManagerClient* wm_client() { return wm_client_; }
 
  protected:
   // testing::Test:
   void SetUp() override {
     connection_manager_.reset(new ConnectionManager(
         &delegate_, scoped_ptr<DisplayManager>(new TestDisplayManager)));
     scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
-        connection_manager_.get(), kInvalidConnectionId, std::string(),
-        std::string("mojo:window_manager"), RootViewId()));
+        connection_manager_.get(), kInvalidConnectionId, RootViewId()));
     scoped_ptr<TestClientConnection> client_connection(
         new TestClientConnection(service.Pass()));
     wm_client_ = client_connection->client();
     ASSERT_TRUE(wm_client_ != nullptr);
     connection_manager_->SetWindowManagerClientConnection(
         client_connection.Pass());
     ASSERT_TRUE(wm_connection() != nullptr);
     ASSERT_TRUE(wm_connection()->root() != nullptr);
   }
 
@@ skipping 25 matching lines @@
 //       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));
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  test->wm_connection()->Embed(request.Pass(), *embed_view_id,
-                               ViewManagerServiceImpl::EmbedType::NO_REEMBED,
-                               nullptr, nullptr, mojo::Callback<void(bool)>());
+  test->wm_connection()->EmbedAllowingReembed(*embed_view_id, request.Pass(),
+                                              mojo::Callback<void(bool)>());
   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 116 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));
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  wm_connection()->Embed(request.Pass(), embed_view_id,
-                         ViewManagerServiceImpl::EmbedType::NO_REEMBED, nullptr,
-                         nullptr, mojo::Callback<void(bool)>());
+  wm_connection()->EmbedAllowingReembed(embed_view_id, request.Pass(),
+                                        mojo::Callback<void(bool)>());
   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 27 matching lines @@
 
 // Verifies focus correctly changes on pointer events.
 TEST_F(ViewManagerServiceTest, FocusOnPointer) {
   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));
   connection_manager()->root()->SetBounds(gfx::Rect(0, 0, 100, 100));
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  wm_connection()->Embed(request.Pass(), embed_view_id,
-                         ViewManagerServiceImpl::EmbedType::NO_REEMBED, nullptr,
-                         nullptr, mojo::Callback<void(bool)>());
+  wm_connection()->EmbedAllowingReembed(embed_view_id, request.Pass(),
+                                        mojo::Callback<void(bool)>());
   ViewManagerServiceImpl* connection1 =
       connection_manager()->GetConnectionWithRoot(embed_view_id);
   ASSERT_TRUE(connection1 != nullptr);
   ASSERT_NE(connection1, wm_connection());
 
   connection_manager()
       ->GetView(embed_view_id)
       ->SetBounds(gfx::Rect(0, 0, 50, 50));
 
   const ViewId child1(connection1->id(), 1);
@@ skipping 47 matching lines @@
   EXPECT_EQ(connection_manager()->root(),
             connection_manager()->GetFocusedView());
   ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u);
   EXPECT_EQ("InputEvent view=0,1 event_action=4",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   EXPECT_TRUE(connection1_client->tracker()->changes()->empty());
   ;
 }
 
 }  // namespace view_manager