Standardize struct public member variables in ServiceProcessState::StateData

chrome/common/service_process_util_posix.h

Index: chrome/common/service_process_util_posix.h
diff --git a/chrome/common/service_process_util_posix.h b/chrome/common/service_process_util_posix.h
index 116437428188a86d0fa91cf3b236caf83726676d..16031e6d61198f83c1370ebf57a74ffaf7fb2b63 100644
--- a/chrome/common/service_process_util_posix.h
+++ b/chrome/common/service_process_util_posix.h
@@ -64,25 +64,21 @@ struct ServiceProcessState::StateData
   // to be monitoring it.
   void SignalReady(base::WaitableEvent* signal, bool* success);
 
-
-  // TODO(jhawkins): Either make this a class or rename these public member
-  // variables to remove the trailing underscore.
-
 #if defined(OS_MACOSX)
   bool WatchExecutable();
 
-  base::ScopedCFTypeRef<CFDictionaryRef> launchd_conf_;
-  base::FilePathWatcher executable_watcher_;
+  base::ScopedCFTypeRef<CFDictionaryRef> launchd_conf;
+  base::FilePathWatcher executable_watcher;
 #endif  // OS_MACOSX
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-  scoped_ptr<MultiProcessLock> initializing_lock_;
-  scoped_ptr<MultiProcessLock> running_lock_;
+  scoped_ptr<MultiProcessLock> initializing_lock;
+  scoped_ptr<MultiProcessLock> running_lock;
 #endif
-  scoped_ptr<ServiceProcessTerminateMonitor> terminate_monitor_;
-  base::MessageLoopForIO::FileDescriptorWatcher watcher_;
-  int sockets_[2];
-  struct sigaction old_action_;
-  bool set_action_;
+  scoped_ptr<ServiceProcessTerminateMonitor> terminate_monitor;
+  base::MessageLoopForIO::FileDescriptorWatcher watcher;
+  int sockets[2];
+  struct sigaction old_action;
+  bool set_action;
 
  protected:
   friend class base::RefCountedThreadSafe<ServiceProcessState::StateData>;