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

Unified Diff: services/view_manager/view_manager_service_apptest.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_apptest.cc
diff --git a/services/view_manager/view_manager_service_apptest.cc b/services/view_manager/view_manager_service_apptest.cc
index a925c8e097c36cf3c4841b89375a4b21bfdcdfe7..3adc80ce8d91ecdc03713e85a581e544f9578007 100644
--- a/services/view_manager/view_manager_service_apptest.cc
+++ b/services/view_manager/view_manager_service_apptest.cc
@@ -29,6 +29,7 @@ using mojo::ORDER_DIRECTION_BELOW;
using mojo::OrderDirection;
using mojo::RectPtr;
using mojo::ServiceProvider;
+using mojo::ServiceProviderPtr;
using mojo::String;
using mojo::ViewDataPtr;
using mojo::ViewManagerClient;
@@ -82,9 +83,7 @@ bool Embed(ViewManagerService* vm, Id root_id) {
bool result = false;
base::RunLoop run_loop;
{
- mojo::ServiceProviderPtr sp;
- vm->Embed("mojo:view_manager_service_apptests", root_id,
- GetProxy(&sp),
+ vm->Embed("mojo:view_manager_service_apptests", root_id, nullptr, nullptr,
base::Bind(&BoolResultCallback, &run_loop, &result));
}
run_loop.Run();
@@ -266,6 +265,7 @@ class ViewManagerClientImpl : public mojo::InterfaceImpl<ViewManagerClient>,
const String& creator_url,
ViewDataPtr root,
InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services,
mojo::ScopedMessagePipeHandle window_manager_pipe) override {
tracker()->OnEmbed(connection_id, creator_url, root.Pass());
got_embed_ = true;

Powered by Google App Engine
This is Rietveld 408576698