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

chrome/service/service_process.h

Index: chrome/service/service_process.h
diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h
index a3b8cdce0a2dca438c860b965d70c7f8d0604a37..aff6e2e1a3aa78413b48e9e9936aa45c549dae2e 100644
--- a/chrome/service/service_process.h
+++ b/chrome/service/service_process.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -20,6 +20,7 @@ class ServiceProcessPrefs;
 class ServiceIPCServer;
 class CommandLine;
 class ServiceURLRequestContextGetter;
+class ServiceProcessState;
 
 namespace net {
 class NetworkChangeNotifier;
@@ -36,8 +37,10 @@ class ServiceProcess : public CloudPrintProxy::Client,
   ~ServiceProcess();
 
   // Initialize the ServiceProcess with the message loop that it should run on.
+  // ServiceProcess takes ownership of |state|.
   bool Initialize(MessageLoopForUI* message_loop,
-                  const CommandLine& command_line);
+                  const CommandLine& command_line,
+                  ServiceProcessState* state);
   bool Teardown();
   // TODO(sanjeevr): Change various parts of the code such as
   // net::ProxyService::CreateSystemProxyConfigService to take in
@@ -120,6 +123,7 @@ class ServiceProcess : public CloudPrintProxy::Client,
   scoped_ptr<CloudPrintProxy> cloud_print_proxy_;
   scoped_ptr<ServiceProcessPrefs> service_prefs_;
   scoped_ptr<ServiceIPCServer> ipc_server_;
+  scoped_ptr<ServiceProcessState> service_process_state_;
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;