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

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

Issue 2427443002: Replace remaining shell references with service manager (Closed)
Patch Set: Created 4 years, 2 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
Index: services/service_manager/tests/lifecycle/lifecycle_unittest.cc
diff --git a/services/service_manager/tests/lifecycle/lifecycle_unittest.cc b/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
index 0febe6d68046c01eb560398c9885167c66c6ec6d..45f9ce3220d8c0a7f0b89ff8152a69a853191d79 100644
--- a/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
+++ b/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
@@ -191,7 +191,8 @@ class LifecycleTest : public test::ServiceTest {
private:
std::unique_ptr<InstanceState> TrackInstances() {
mojom::ServiceManagerPtr service_manager;
- connector()->ConnectToInterface("service:shell", &service_manager);
+ connector()->ConnectToInterface("service:service_manager",
+ &service_manager);
mojom::ServiceManagerListenerPtr listener;
base::RunLoop loop;
InstanceState* state = new InstanceState(GetProxy(&listener), &loop);
@@ -242,7 +243,7 @@ TEST_F(LifecycleTest, Standalone_Crash) {
EXPECT_EQ(0u, instances()->GetNewInstanceCount());
}
-TEST_F(LifecycleTest, Standalone_CloseShellConnection) {
+TEST_F(LifecycleTest, Standalone_CloseServiceManagerConnection) {
test::mojom::LifecycleControlPtr lifecycle = ConnectTo(kTestAppName);
EXPECT_TRUE(instances()->HasInstanceForName(kTestAppName));
@@ -250,7 +251,7 @@ TEST_F(LifecycleTest, Standalone_CloseShellConnection) {
base::RunLoop loop;
lifecycle.set_connection_error_handler(base::Bind(&QuitLoop, &loop));
- lifecycle->CloseShellConnection();
+ lifecycle->CloseServiceManagerConnection();
WaitForInstanceDestruction();

Powered by Google App Engine
This is Rietveld 408576698