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

Unified Diff: services/window_manager/window_manager_api_unittest.cc

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase for trybots (no code changes from ps2) 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
« no previous file with comments | « services/window_manager/main.cc ('k') | services/window_manager/window_manager_app.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/window_manager_api_unittest.cc
diff --git a/services/window_manager/window_manager_api_unittest.cc b/services/window_manager/window_manager_api_unittest.cc
index d1729ddd868bc7ad2ccad29b886749286629ec83..2dd856e67868f99e00d0da2ad3a9bc19b12b6c37 100644
--- a/services/window_manager/window_manager_api_unittest.cc
+++ b/services/window_manager/window_manager_api_unittest.cc
@@ -107,8 +107,8 @@ class TestApplicationLoader : public mojo::ApplicationLoader,
// Overridden from mojo::ViewManagerDelegate:
void OnEmbed(View* root,
- mojo::ServiceProviderImpl* exported_services,
- scoped_ptr<mojo::ServiceProvider> imported_services) override {
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) override {
root_added_callback_.Run(root);
}
void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override {}
@@ -166,10 +166,7 @@ class WindowManagerApiTest : public testing::Test {
Id OpenWindowWithURL(const std::string& url) {
base::RunLoop run_loop;
- mojo::ServiceProviderPtr sp;
- BindToProxy(new mojo::ServiceProviderImpl, &sp);
- window_manager_->Embed(
- url, mojo::MakeRequest<mojo::ServiceProvider>(sp.PassMessagePipe()));
+ window_manager_->Embed(url, nullptr, nullptr);
run_loop.Run();
return WaitForEmbed();
}
« no previous file with comments | « services/window_manager/main.cc ('k') | services/window_manager/window_manager_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698