| 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;
|
|
|