Replace remaining shell references with service manager

services/service_manager/runner/host/child_process_host_unittest.cc

 // Copyright 2014 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.
 
 // Note: This file also tests child_process.*.
 
 #include "services/service_manager/runner/host/child_process_host.h"
 
 #include <memory>
 #include <utility>
@@ skipping 48 matching lines @@
       base::CommandLine* command_line) override {
     adjust_count_++;
   }
 
   size_t adjust_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(NativeRunnerDelegateImpl);
 };
 
 #if defined(OS_ANDROID)
-// TODO(qsr): Multiprocess shell tests are not supported on android.
+// TODO(qsr): Multiprocess service manager tests are not supported on android.
 #define MAYBE_StartJoin DISABLED_StartJoin
 #else
 #define MAYBE_StartJoin StartJoin
 #endif  // defined(OS_ANDROID)
 // Just tests starting the child process and joining it (without starting an
 // app).
 TEST(ChildProcessHostTest, MAYBE_StartJoin) {
-  base::FilePath shell_dir;
-  PathService::Get(base::DIR_MODULE, &shell_dir);
+  base::FilePath service_manager_dir;
+  PathService::Get(base::DIR_MODULE, &service_manager_dir);
   base::MessageLoop message_loop;
   scoped_refptr<base::SequencedWorkerPool> blocking_pool(
       new base::SequencedWorkerPool(3, "blocking_pool",
                                     base::TaskPriority::USER_VISIBLE));
 
   base::Thread io_thread("io_thread");
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   io_thread.StartWithOptions(options);
 
@@ skipping 12 matching lines @@
   run_loop.Run();
 
   child_process_host.Join();
   blocking_pool->Shutdown();
   mojo::edk::ShutdownIPCSupport();
   EXPECT_EQ(1u, native_runner_delegate.get_and_clear_adjust_count());
 }
 
 }  // namespace
 }  // namespace service_manager