[login_manager] Fix thread-safety issues at shutdown

session_manager_service.h

 // Copyright (c) 2009-2010 The Chromium OS 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 LOGIN_MANAGER_SESSION_MANAGER_SERVICE_H_
 #define LOGIN_MANAGER_SESSION_MANAGER_SERVICE_H_
 
 #include <dbus/dbus.h>
 #include <errno.h>
 #include <glib.h>
 #include <gtest/gtest.h>
 #include <signal.h>
 #include <unistd.h>
 
 #include <string>
 #include <vector>
 
 #include <base/basictypes.h>
 #include <base/ref_counted.h>
 #include <base/scoped_ptr.h>
 #include <base/thread.h>
+#include <base/waitable_event.h>
 #include <chromeos/dbus/abstract_dbus_service.h>
 #include <chromeos/dbus/dbus.h>
 #include <chromeos/dbus/service_constants.h>
 
 #include "login_manager/child_job.h"
 #include "login_manager/file_checker.h"
 #include "login_manager/owner_key.h"
 #include "login_manager/owner_key_loss_mitigator.h"
 #include "login_manager/pref_store.h"
 #include "login_manager/system_utils.h"
@@ skipping 16 matching lines @@
 // D-Bus and entering the glib run loop.
 //
 // ::g_type_init() must be called before this class is used.
 //
 // All signatures used in the methods of the ownership API are
 // SHA1 with RSA encryption.
 class SessionManagerService
     : public base::RefCountedThreadSafe<SessionManagerService>,
       public chromeos::dbus::AbstractDbusService {
  public:
-  struct PersistKeyData {
-   public:
-    PersistKeyData(SystemUtils* utils, OwnerKey* key)
-        : signaler(utils),
-          to_persist(key) {
-    }
-    ~PersistKeyData() {}
-    SystemUtils* signaler;
-    OwnerKey* to_persist;
-  };
-
-  struct PersistStoreData {
-   public:
-    PersistStoreData(SystemUtils* utils, PrefStore* store)
-        : signaler(utils),
-          to_persist(store) {
-    }
-    ~PersistStoreData() {}
-    SystemUtils* signaler;
-    PrefStore* to_persist;
-  };
 
   SessionManagerService(std::vector<ChildJobInterface*> child_jobs);
   virtual ~SessionManagerService();
 
   // If you want to call any of these setters, you should do so before calling
   // any other methods on this class.
   class TestApi {
    public:
     // Allows a test program to set the pid of a child.
     void set_child_pid(int i_child, int pid) {
@@ skipping 375 matching lines @@
   void PersistKey();
 
   // |store_| is persisted to disk, and then posts a task to |message_loop_|
   // to signal Chromium when done.
   void PersistWhitelist();
 
   // |store_| is persisted to disk, and then posts a task to |message_loop_|
   // to signal Chromium when done.
   void PersistStore();
 
+  // |store_| is persisted to disk, and |event| is signaled when done.  This
+  // is used to provide synchronous, threadsafe persisting.
+  void PersistStoreSync(base::WaitableEvent* event);
+
   void StartKeyGeneration();
 
   // Uses |system_| to send |signal_name| to Chromium.  Attaches a payload
   // to the signal indicating the status of |succeeded|.
   void SendSignal(const char signal_name[], bool succeeded);
 
   bool ShouldRunChildren();
   // Returns true if |child_job| believes it should be stopped.
   // If the child believes it should be stopped (as opposed to not run anymore)
   // we actually exit the Service as well.
@@ skipping 43 matching lines @@
 
   bool shutting_down_;
   bool shutdown_already_;
 
   friend class TestAPI;
   DISALLOW_COPY_AND_ASSIGN(SessionManagerService);
 };
 }  // namespace login_manager
 
 #endif  // LOGIN_MANAGER_SESSION_MANAGER_SERVICE_H_