Move TransportSecurityPersister completely to IO thread.

chrome/browser/transport_security_persister.h

 // 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.
 
 // TransportSecurityState maintains an in memory database containing the
 // list of hosts that currently have transport security enabled. This
 // singleton object deals with writing that data out to disk as needed and
 // loading it at startup.
 
 // At startup we need to load the transport security state from the
@@ skipping 19 matching lines @@
 //   copies the current state of the TransportSecurityState, serialises
 //   and writes to disk.
 
 #ifndef CHROME_BROWSER_TRANSPORT_SECURITY_PERSISTER_H_
 #define CHROME_BROWSER_TRANSPORT_SECURITY_PERSISTER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/common/important_file_writer.h"
-#include "content/browser/browser_thread.h"
 #include "net/base/transport_security_state.h"
 
+// Reads and updates on-disk TransportSecurity state.
+// Must be created, used and destroyed only on the IO thread.
 class TransportSecurityPersister
-    : public base::RefCountedThreadSafe<TransportSecurityPersister,
-                                        BrowserThread::DeleteOnUIThread>,
-      public net::TransportSecurityState::Delegate,
-      public ImportantFileWriter::DataSerializer {
+    : public net::TransportSecurityState::Delegate,
+      public ImportantFileWriter::DataSerializer,
+      public base::SupportsWeakPtr<TransportSecurityPersister> {

[willchan no longer on Chromium, 2011/09/20 19:09:04]

Can you use base::WeakPtrFactory as a private member variable instead? I'd
rather not add to the public API unless it's necessary.

[Paweł Hajdan Jr., 2011/09/21 17:59:19]

Good idea, done.

  public:
   TransportSecurityPersister(net::TransportSecurityState* state,
                              const FilePath& profile_path,
                              bool readonly);
-
-  // Starts transport security data load on a background thread.
-  // Must be called on the UI thread right after construction.
-  void Init();
+  virtual ~TransportSecurityPersister();
 
   // Called by the TransportSecurityState when it changes its state.
   virtual void StateIsDirty(net::TransportSecurityState*);
 
   // ImportantFileWriter::DataSerializer:
   virtual bool SerializeData(std::string* data);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
-  friend class DeleteTask<TransportSecurityPersister>;
+  class Loader;
 
-  virtual ~TransportSecurityPersister();
-
-  void Load();
   void CompleteLoad(const std::string& state);
 
-  // IO thread only.
   scoped_refptr<net::TransportSecurityState> transport_security_state_;
 
   // Helper for safely writing the data.
   ImportantFileWriter writer_;
 
   // Whether or not we're in read-only mode.
   const bool readonly_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportSecurityPersister);
 };
 
 #endif  // CHROME_BROWSER_TRANSPORT_SECURITY_PERSISTER_H_