Patch for bug 74983 (among others) to be applied to M11 696 branch.

chrome/service/service_main.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 "base/debug/debugger.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/service/service_process.h"
 
@@ skipping 14 matching lines @@
   VLOG(1) << "Service process launched: "
           << parameters.command_line_.command_line_string();
 
 #if defined(OS_MACOSX)
   chrome_application_mac::RegisterCrApp();
 #endif
 
   base::PlatformThread::SetName("CrServiceMain");
 
   // If there is already a service process running, quit now.
-  if (!ServiceProcessState::GetInstance()->Initialize())
+  scoped_ptr<ServiceProcessState> state(new ServiceProcessState);
+  if (!state->Initialize())
     return 0;
 
 #if defined(OS_WIN)
   sandbox::BrokerServices* broker_services =
       parameters.sandbox_info_.BrokerServices();
   if (broker_services)
     sandbox::InitBrokerServices(broker_services);
 #endif  // defined(OS_WIN)
 
   ServiceProcess service_process;
   if (service_process.Initialize(&main_message_loop,
-                                 parameters.command_line_)) {
+                                 parameters.command_line_,
+                                 state.release())) {
     MessageLoop::current()->Run();
   } else {
     LOG(ERROR) << "Service process failed to initialize";
   }
   service_process.Teardown();
   return 0;
 }