Getting service process on Mac to handle having things moved/changed underneath it.

chrome/common/service_process_util.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
@@ skipping 154 matching lines @@
 
 ServiceProcessState::~ServiceProcessState() {
 #if !defined(OS_MACOSX)
   if (shared_mem_service_data_.get()) {
     shared_mem_service_data_->Delete(GetServiceProcessSharedMemName());
   }
 #endif  // !OS_MACOSX
   TearDownState();
 }
 
-// static
-ServiceProcessState* ServiceProcessState::GetInstance() {
-  return Singleton<ServiceProcessState>::get();
-}
-
 void ServiceProcessState::SignalStopped() {
   TearDownState();
   shared_mem_service_data_.reset();
 }
 
 #if !defined(OS_MACOSX)
 bool ServiceProcessState::Initialize() {
   if (!CreateState()) {
     return false;
   }
@@ skipping 83 matching lines @@
 
   // The user data directory is the only other flag we currently want to
   // possibly store.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   FilePath user_data_dir =
     browser_command_line.GetSwitchValuePath(switches::kUserDataDir);
   if (!user_data_dir.empty())
     autorun_command_line_->AppendSwitchPath(switches::kUserDataDir,
                                             user_data_dir);
 }