Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(817)

Unified Diff: services/view_manager/view_manager_service_unittest.cc

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/view_manager/view_manager_service_unittest.cc
diff --git a/services/view_manager/view_manager_service_unittest.cc b/services/view_manager/view_manager_service_unittest.cc
index b52af41fd3326a74fbff77a7a4c2c93d072647a8..e1e88930ffdc51242f8718bbd8beab6b67c147fe 100644
--- a/services/view_manager/view_manager_service_unittest.cc
+++ b/services/view_manager/view_manager_service_unittest.cc
@@ -28,6 +28,7 @@ using mojo::Array;
using mojo::ERROR_CODE_NONE;
using mojo::InterfaceRequest;
using mojo::ServiceProvider;
+using mojo::ServiceProviderPtr;
using mojo::String;
using mojo::ViewDataPtr;
@@ -50,7 +51,8 @@ class TestViewManagerClient : public mojo::ViewManagerClient {
void OnEmbed(uint16_t connection_id,
const String& embedder_url,
ViewDataPtr root,
- InterfaceRequest<ServiceProvider> parent_service_provider,
+ InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services,
mojo::ScopedMessagePipeHandle window_manager_pipe) override {
tracker_.OnEmbed(connection_id, embedder_url, root.Pass());
}
@@ -270,8 +272,7 @@ void SetUpAnimate1(ViewManagerServiceTest* test, ViewId* 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));
- EXPECT_TRUE(test->wm_connection()->Embed(
- std::string(), *embed_view_id, InterfaceRequest<ServiceProvider>()));
+ test->wm_connection()->Embed(std::string(), *embed_view_id, nullptr, nullptr);
ViewManagerServiceImpl* connection1 =
test->connection_manager()->GetConnectionWithRoot(*embed_view_id);
ASSERT_TRUE(connection1 != nullptr);
@@ -407,8 +408,7 @@ TEST_F(ViewManagerServiceTest, CloneAndAnimateLargerDepth) {
EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));
EXPECT_TRUE(
wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
- EXPECT_TRUE(wm_connection()->Embed(std::string(), embed_view_id,
- InterfaceRequest<ServiceProvider>()));
+ wm_connection()->Embed(std::string(), embed_view_id, nullptr, nullptr);
ViewManagerServiceImpl* connection1 =
connection_manager()->GetConnectionWithRoot(embed_view_id);
ASSERT_TRUE(connection1 != nullptr);

Powered by Google App Engine
This is Rietveld 408576698