Fix race conditions where an object's constructor uses PostTask on itself. This isn't safe since the posted task can execute before the constructor returns, leading to destruction of the object.

BUG=27944
Review URL: http://codereview.chromium.org/399016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32213 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 11 deletions

diff --git a/chrome/browser/strict_transport_security_persister.cc b/chrome/browser/strict_transport_security_persister.cc
index 52fc611..ce6078a 100644
--- a/chrome/browser/strict_transport_security_persister.cc
+++ b/chrome/browser/strict_transport_security_persister.cc
@@ -12,13 +12,19 @@
 #include "chrome/common/chrome_paths.h"
 #include "net/base/strict_transport_security_state.h"
 
-StrictTransportSecurityPersister::StrictTransportSecurityPersister(
-    net::StrictTransportSecurityState* state,
-    const FilePath& profile_path)
-    : state_is_dirty_(false),
-      strict_transport_security_state_(state),
-      state_file_(profile_path.Append(
-          FILE_PATH_LITERAL("StrictTransportSecurity"))) {
+StrictTransportSecurityPersister::StrictTransportSecurityPersister()
+    : state_is_dirty_(false) {
+}
+
+StrictTransportSecurityPersister::~StrictTransportSecurityPersister() {
+  strict_transport_security_state_->SetDelegate(NULL);
+}
+
+void StrictTransportSecurityPersister::Initialize(
+    net::StrictTransportSecurityState* state, const FilePath& profile_path) {
+  strict_transport_security_state_ = state;
+  state_file_ =
+      profile_path.Append(FILE_PATH_LITERAL("StrictTransportSecurity"));
   state->SetDelegate(this);
 
   Task* task = NewRunnableMethod(this,
@@ -26,10 +32,6 @@ StrictTransportSecurityPersister::StrictTransportSecurityPersister(
   ChromeThread::PostDelayedTask(ChromeThread::FILE, FROM_HERE, task, 1000);
 }
 
-StrictTransportSecurityPersister::~StrictTransportSecurityPersister() {
-  strict_transport_security_state_->SetDelegate(NULL);
-}
-
 void StrictTransportSecurityPersister::LoadState() {
   AutoLock locked_(lock_);
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));