SupportsUserData is not thread safe

Lets ensure none of its usages are unsafe.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10919137

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

1 files changed, 14 insertions, 2 deletions

diff --git a/base/supports_user_data.cc b/base/supports_user_data.cc
index b2f1228..2a0263e 100644
--- a/base/supports_user_data.cc
+++ b/base/supports_user_data.cc
@@ -6,9 +6,13 @@
 
 namespace base {
 
-SupportsUserData::SupportsUserData() {}
+SupportsUserData::SupportsUserData() {
+  // Harmless to construct on a different thread to subsequent usage.
+  thread_checker_.DetachFromThread();
+}
 
 SupportsUserData::Data* SupportsUserData::GetUserData(const void* key) const {
+  DCHECK(thread_checker_.CalledOnValidThread());
   DataMap::const_iterator found = user_data_.find(key);
   if (found != user_data_.end())
     return found->second.get();
@@ -16,13 +20,21 @@ SupportsUserData::Data* SupportsUserData::GetUserData(const void* key) const {
 }
 
 void SupportsUserData::SetUserData(const void* key, Data* data) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   user_data_[key] = linked_ptr<Data>(data);
 }
 
 void SupportsUserData::RemoveUserData(const void* key) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   user_data_.erase(key);
 }
 
-SupportsUserData::~SupportsUserData() {}
+void SupportsUserData::DetachUserDataThread() {
+  thread_checker_.DetachFromThread();
+}
+
+SupportsUserData::~SupportsUserData() {
+  DCHECK(thread_checker_.CalledOnValidThread() || user_data_.empty());
+}
 
 }  // namespace base