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

Unified Diff: services/service_manager/tests/connect/connect_test_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/connect/connect_test_package.cc
diff --git a/services/service_manager/tests/connect/connect_test_package.cc b/services/service_manager/tests/connect/connect_test_package.cc
index 9d4a3d22775a7b9fea6cdd6ed3a720e99878c200..e62b65fe017a0d259f8b1e8239da9ceb5fc3e1d9 100644
--- a/services/service_manager/tests/connect/connect_test_package.cc
+++ b/services/service_manager/tests/connect/connect_test_package.cc
@@ -54,33 +54,8 @@ class ProvidedService
}
private:
- class ForwardingServiceImpl : public Service {
- public:
- explicit ForwardingServiceImpl(Service* service)
- : service_(service) {}
- ~ForwardingServiceImpl() override {}
-
- // Service:
- void OnStart(ServiceContext* context) override {
- service_->OnStart(context);
- }
-
- bool OnConnect(const ServiceInfo& remote_info,
- InterfaceRegistry* registry) override {
- return service_->OnConnect(remote_info, registry);
- }
-
- bool OnStop() override { return service_->OnStop(); }
-
- private:
- Service* const service_;
-
- DISALLOW_COPY_AND_ASSIGN(ForwardingServiceImpl);
- };
-
// service_manager::Service:
- void OnStart(ServiceContext* context) override {
- context_ = context;
+ void OnStart() override {
bindings_.set_connection_error_handler(
base::Bind(&ProvidedService::OnConnectionError,
base::Unretained(this)));
@@ -95,10 +70,10 @@ class ProvidedService
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;
@@ -128,7 +103,7 @@ class ProvidedService
}
void GetInstance(const GetInstanceCallback& callback) override {
- callback.Run(context_->identity().instance());
+ callback.Run(context()->identity().instance());
}
// test::mojom::BlockedInterface:
@@ -142,7 +117,7 @@ class ProvidedService
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(loop.QuitClosure());
@@ -156,7 +131,7 @@ class ProvidedService
// base::SimpleThread:
void Run() override {
- ServiceRunner(new ForwardingServiceImpl(this)).Run(
+ ServiceRunner(new ForwardingService(this)).Run(
request_.PassMessagePipe().release().value(), false);
caller_.reset();
bindings_.CloseAllBindings();
@@ -169,7 +144,6 @@ class ProvidedService
base::MessageLoop::current()->QuitWhenIdle();
}
- ServiceContext* context_ = nullptr;
const std::string title_;
mojom::ServiceRequest request_;
test::mojom::ExposedInterfacePtr caller_;
@@ -192,9 +166,7 @@ class ConnectTestService
private:
// service_manager::Service:
- void OnStart(ServiceContext* context) override {
- context_ = context;
-
+ void OnStart() override {
base::Closure error_handler =
base::Bind(&ConnectTestService::OnConnectionError,
base::Unretained(this));
@@ -244,15 +216,14 @@ class ConnectTestService
}
void GetInstance(const GetInstanceCallback& callback) override {
- callback.Run(context_->identity().instance());
+ callback.Run(context()->identity().instance());
}
void OnConnectionError() {
if (bindings_.empty() && service_factory_bindings_.empty())
- context_->RequestQuit();
+ context()->RequestQuit();
}
- ServiceContext* context_ = nullptr;
std::vector<std::unique_ptr<Service>> delegates_;
mojo::BindingSet<mojom::ServiceFactory> service_factory_bindings_;
mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
« no previous file with comments | « services/service_manager/tests/connect/connect_test_exe.cc ('k') | services/service_manager/tests/lifecycle/app_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698