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

Unified Diff: services/service_manager/tests/lifecycle/package.cc

Issue 2487573002: Service Manager: Remove ServiceContext* arg from Service::OnStart() (Closed)
Patch Set: rebase Created 4 years, 1 month 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/service_manager/tests/lifecycle/package.cc
diff --git a/services/service_manager/tests/lifecycle/package.cc b/services/service_manager/tests/lifecycle/package.cc
index 1be7d9353a3a6f3cccc487d232110f0940867c47..72874098c15adff84abdfab80978b8a6d7a08279 100644
--- a/services/service_manager/tests/lifecycle/package.cc
+++ b/services/service_manager/tests/lifecycle/package.cc
@@ -40,10 +40,6 @@ class PackagedApp
private:
// service_manager::Service:
- void OnStart(service_manager::ServiceContext* context) override {
- context_ = context;
- }
-
bool OnConnect(const service_manager::ServiceInfo& remote_info,
service_manager::InterfaceRegistry* registry) override {
registry->AddInterface<service_manager::test::mojom::LifecycleControl>(
@@ -78,7 +74,7 @@ class PackagedApp
void CloseServiceManagerConnection() override {
service_manager_connection_closed_callback_.Run();
- context_->QuitNow();
+ context()->QuitNow();
// This only closed our relationship with the service manager, existing
// |bindings_|
// remain active.
@@ -91,7 +87,6 @@ class PackagedApp
}
}
- service_manager::ServiceContext* context_;
mojo::BindingSet<service_manager::test::mojom::LifecycleControl> bindings_;
// Run when this object's connection to the service manager is closed.
@@ -112,9 +107,7 @@ class Package : public service_manager::Service,
private:
// service_manager::Service:
- void OnStart(service_manager::ServiceContext* context) override {
- app_client_.OnStart(context);
- }
+ void OnStart() override { app_client_.OnStart(); }
bool OnConnect(const service_manager::ServiceInfo& remote_info,
service_manager::InterfaceRegistry* registry) override {
« no previous file with comments | « services/service_manager/tests/lifecycle/app_client.cc ('k') | services/service_manager/tests/lifecycle/parent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698