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

chrome/service/service_process.h

-// 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.
 
 #ifndef CHROME_SERVICE_SERVICE_PROCESS_H_
 #define CHROME_SERVICE_SERVICE_PROCESS_H_
 #pragma once
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/service/cloud_print/cloud_print_proxy.h"
 #include "chrome/service/remoting/chromoting_host_manager.h"
 
 class ServiceProcessPrefs;
 class ServiceIPCServer;
 class CommandLine;
 class ServiceURLRequestContextGetter;
+class ServiceProcessState;
 
 namespace net {
 class NetworkChangeNotifier;
 }
 
 class CommandLine;
 
 // The ServiceProcess does not inherit from ChildProcess because this
 // process can live independently of the browser process.
 class ServiceProcess : public CloudPrintProxy::Client,
                        public remoting::ChromotingHostManager::Observer {
  public:
   ServiceProcess();
   ~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
   // MessageLoopProxy* instead of MessageLoop*. When we have done that, we can
   // remove the io_thread() and file_thread() accessors and replace them with
   // io_message_loop_proxy() and file_message_loop_proxy() respectively.
 
   // Returns the thread that we perform I/O coordination on (network requests,
   // communication with renderers, etc.
   // NOTE: You should ONLY use this to pass to IPC or other objects which must
@@ skipping 62 matching lines @@
   // Called exactly ONCE per process instance for each service that gets
   // disabled in this process (note that shutdown != disabled).
   void OnServiceDisabled();
 
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<base::Thread> io_thread_;
   scoped_ptr<base::Thread> file_thread_;
   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_;
 
   // Pointer to the main message loop that host this object.
   MessageLoop* main_message_loop_;
 
   // Count of currently enabled services in this process.
   int enabled_services_;
 
   // Speficies whether a product update is available.
   bool update_available_;
 
   scoped_refptr<ServiceURLRequestContextGetter> request_context_getter_;
 
 #if defined(ENABLE_REMOTING)
   scoped_refptr<remoting::ChromotingHostManager> remoting_host_manager_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ServiceProcess);
 };
 
 // Disable refcounting for runnable method because it is really not needed
 // when we post tasks on the main message loop.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);
 
 extern ServiceProcess* g_service_process;
 
 #endif  // CHROME_SERVICE_SERVICE_PROCESS_H_