Replace remaining shell references with service manager

services/service_manager/tests/lifecycle/lifecycle_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 173 matching lines @@
 
   void WaitForInstanceDestruction() {
     base::RunLoop loop;
     instances()->WaitForInstanceDestruction(&loop);
     loop.Run();
   }
 
  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);
     service_manager->AddListener(std::move(listener));
     loop.Run();
     return base::WrapUnique(state);
   }
 
   std::unique_ptr<InstanceState> instances_;
 
@@ skipping 30 matching lines @@
   base::RunLoop loop;
   lifecycle.set_connection_error_handler(base::Bind(&QuitLoop, &loop));
   lifecycle->Crash();
   loop.Run();
 
   WaitForInstanceDestruction();
   EXPECT_FALSE(instances()->HasInstanceForName(kTestAppName));
   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));
   EXPECT_EQ(1u, instances()->GetNewInstanceCount());
 
   base::RunLoop loop;
   lifecycle.set_connection_error_handler(base::Bind(&QuitLoop, &loop));
-  lifecycle->CloseShellConnection();
+  lifecycle->CloseServiceManagerConnection();
 
   WaitForInstanceDestruction();
 
   // |lifecycle| pipe should still be valid.
   PingPong(lifecycle.get());
 }
 
 TEST_F(LifecycleTest, PackagedApp_GracefulQuit) {
   test::mojom::LifecycleControlPtr lifecycle = ConnectTo(kTestPackageAppNameA);
 
@@ skipping 179 matching lines @@
   parent->Quit();
 
   // Quitting the parent should cascade-quit the child.
   WaitForInstanceDestruction();
   EXPECT_EQ(0u, instances()->GetNewInstanceCount());
   EXPECT_FALSE(instances()->HasInstanceForName(kTestParentName));
   EXPECT_FALSE(instances()->HasInstanceForName(kTestAppName));
 }
 
 }  // namespace service_manager