Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/child_process_launcher.cc

 // Copyright (c) 2010 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/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/lock.h"
@@ skipping 155 matching lines @@
 #endif  // defined(OS_LINUX)
 
       bool launched = false;
 #if defined(OS_MACOSX)
       // It is possible for the child process to die immediately after
       // launching.  To prevent leaking MachBroker map entries in this case,
       // lock around all of LaunchApp().  If the child dies, the death
       // notification will be processed by the MachBroker after the call to
       // AddPlaceholderForPid(), enabling proper cleanup.
       {  // begin scope for AutoLock
-        MachBroker* broker = MachBroker::instance();
+        MachBroker* broker = MachBroker::GetInstance();
         AutoLock lock(broker->GetLock());
 
         // This call to |PrepareForFork()| will start the MachBroker listener
         // thread, if it is not already running.  Therefore the browser process
         // will be listening for Mach IPC before LaunchApp() is called.
         broker->PrepareForFork();
 #endif
         // Actually launch the app.
         launched = base::LaunchApp(cmd_line->argv(), env, fds_to_map,
                                    /* wait= */false, &handle);
@@ skipping 145 matching lines @@
   if (child_exited)
     context_->process_.Close();
 
   return did_crash;
 }
 
 void ChildProcessLauncher::SetProcessBackgrounded(bool background) {
   DCHECK(!context_->starting_);
   context_->process_.SetProcessBackgrounded(background);
 }