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

Unified Diff: services/service_manager/tests/connect/connect_test_app.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/connect/connect_test_app.cc
diff --git a/services/service_manager/tests/connect/connect_test_app.cc b/services/service_manager/tests/connect/connect_test_app.cc
index b3be3a6ab794af9a725e4bdd1edc97c06d6f5a88..8d427c097f847f7e8d830d1821cb184a1ab5462a 100644
--- a/services/service_manager/tests/connect/connect_test_app.cc
+++ b/services/service_manager/tests/connect/connect_test_app.cc
@@ -54,8 +54,7 @@ class ConnectTestApp : public Service,
private:
// service_manager::Service:
- void OnStart(ServiceContext* context) override {
- context_ = context;
+ void OnStart() override {
bindings_.set_connection_error_handler(
base::Bind(&ConnectTestApp::OnConnectionError,
base::Unretained(this)));
@@ -63,6 +62,7 @@ class ConnectTestApp : public Service,
base::Bind(&ConnectTestApp::OnConnectionError,
base::Unretained(this)));
}
+
bool OnConnect(const ServiceInfo& remote_info,
InterfaceRegistry* registry) override {
registry->AddInterface<test::mojom::ConnectTestService>(this);
@@ -73,10 +73,10 @@ class ConnectTestApp : public Service,
test::mojom::ConnectionStatePtr state(test::mojom::ConnectionState::New());
state->connection_remote_name = remote_info.identity.name();
state->connection_remote_userid = remote_info.identity.user_id();
- state->initialize_local_name = context_->identity().name();
- state->initialize_userid = context_->identity().user_id();
+ state->initialize_local_name = context()->identity().name();
+ state->initialize_userid = context()->identity().user_id();
- context_->connector()->ConnectToInterface(remote_info.identity, &caller_);
+ context()->connector()->ConnectToInterface(remote_info.identity, &caller_);
caller_->ConnectionAccepted(std::move(state));
return true;
@@ -111,7 +111,7 @@ class ConnectTestApp : public Service,
callback.Run("APP");
}
void GetInstance(const GetInstanceCallback& callback) override {
- callback.Run(context_->identity().instance());
+ callback.Run(context()->identity().instance());
}
// test::mojom::StandaloneApp:
@@ -119,7 +119,7 @@ class ConnectTestApp : public Service,
const ConnectToAllowedAppInBlockedPackageCallback& callback) override {
base::RunLoop run_loop;
std::unique_ptr<Connection> connection =
- context_->connector()->Connect("service:connect_test_a");
+ context()->connector()->Connect("service:connect_test_a");
connection->SetConnectionLostClosure(
base::Bind(&ConnectTestApp::OnConnectionBlocked,
base::Unretained(this), callback, &run_loop));
@@ -139,7 +139,7 @@ class ConnectTestApp : public Service,
void ConnectToClassInterface(
const ConnectToClassInterfaceCallback& callback) override {
std::unique_ptr<Connection> connection =
- context_->connector()->Connect("service:connect_test_class_app");
+ context()->connector()->Connect("service:connect_test_class_app");
test::mojom::ClassInterfacePtr class_interface;
connection->GetInterface(&class_interface);
std::string ping_response;
@@ -174,7 +174,7 @@ class ConnectTestApp : public Service,
const ConnectToClassAppAsDifferentUserCallback& callback) override {
Connector::ConnectParams params(target);
std::unique_ptr<Connection> connection =
- context_->connector()->Connect(&params);
+ context()->connector()->Connect(&params);
{
base::RunLoop loop;
connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
@@ -206,7 +206,6 @@ class ConnectTestApp : public Service,
base::MessageLoop::current()->QuitWhenIdle();
}
- ServiceContext* context_ = nullptr;
mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
mojo::BindingSet<test::mojom::StandaloneApp> standalone_bindings_;
mojo::BindingSet<test::mojom::BlockedInterface> blocked_bindings_;
« no previous file with comments | « services/service_manager/public/cpp/service_test.h ('k') | services/service_manager/tests/connect/connect_test_class_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698