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

Unified Diff: services/window_manager/window_manager_apptest.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/window_manager_app.cc ('k') | services/window_manager/window_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/window_manager_apptest.cc
diff --git a/services/window_manager/window_manager_apptest.cc b/services/window_manager/window_manager_apptest.cc
index 526a3256b64a0a9781c6ab2d8dd9d68395c5b8a8..74e76c622e4aba45075c87246eeb64b08c7c415b 100644
--- a/services/window_manager/window_manager_apptest.cc
+++ b/services/window_manager/window_manager_apptest.cc
@@ -43,8 +43,8 @@ class TestApplication : public ApplicationDelegate, public ViewManagerDelegate {
// ViewManagerDelegate:
void OnEmbed(View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) override {
+ InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services) override {
root_ = root;
embed_callback_.Run();
}
@@ -74,10 +74,7 @@ class WindowManagerApplicationTest : public test::ApplicationTestBase {
}
void EmbedApplicationWithURL(const std::string& url) {
- ServiceProviderPtr service_provider;
- BindToProxy(new ServiceProviderImpl, &service_provider);
- window_manager_->Embed(
- url, MakeRequest<ServiceProvider>(service_provider.PassMessagePipe()));
+ window_manager_->Embed(url, nullptr, nullptr);
base::RunLoop run_loop;
test_application_.set_embed_callback(run_loop.QuitClosure());
« no previous file with comments | « services/window_manager/window_manager_app.cc ('k') | services/window_manager/window_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698