Misc. fixes to MashRunner environment

chrome/app/mash/mash_runner.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 "chrome/app/mash/mash_runner.h"
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 115 matching lines @@
 // Quits |run_loop| if the |identity| of the quitting service is critical to the
 // system (e.g. the window manager). Used in the main process.
 void OnInstanceQuitInMain(base::RunLoop* run_loop,
                           int* exit_value,
                           const service_manager::Identity& identity) {
   DCHECK(exit_value);
   DCHECK(run_loop);
 
   if (identity.name() != mash::common::GetWindowManagerServiceName() &&
       identity.name() != ui::mojom::kServiceName &&
-      identity.name() != content::mojom::kBrowserServiceName) {
+      identity.name() != content::mojom::kPackagedServicesServiceName) {
     return;
   }
 
   LOG(ERROR) << "Main process exiting because service " << identity.name()
              << " quit unexpectedly.";
   *exit_value = 1;
   run_loop->Quit();
 }
 
 }  // namespace
@@ skipping 54 matching lines @@
   base::RunLoop run_loop;
   int exit_value = 0;
   background_service_manager.SetInstanceQuitCallback(
       base::Bind(&OnInstanceQuitInMain, &run_loop, &exit_value));
 
   // Ping services that we know we want to launch on startup (UI service,
   // window manager, quick launch app).
   context.connector()->Connect(ui::mojom::kServiceName);
   context.connector()->Connect(mash::common::GetWindowManagerServiceName());
   context.connector()->Connect(mash::quick_launch::mojom::kServiceName);
-  context.connector()->Connect(content::mojom::kBrowserServiceName);
+  context.connector()->Connect(content::mojom::kPackagedServicesServiceName);
 
   run_loop.Run();
 
   // |context| must be destroyed before the message loop.
   return exit_value;
 }
 
 int MashRunner::RunChild() {
   service_manager::WaitForDebuggerIfNecessary();
 
@@ skipping 65 matching lines @@
       command_line->GetSwitchValueASCII(switches::kWaitForDebugger)) {
     return;
   }
 
   // Include the pid as logging may not have been initialized yet (the pid
   // printed out by logging is wrong).
   LOG(WARNING) << "waiting for debugger to attach for service " << service_name
                << " pid=" << base::Process::Current().Pid();
   base::debug::WaitForDebugger(120, true);
 }