diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 15:25:56 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 15:25:56 +0000 |
| commit | a21643a4c0c76665b8820caf3103e0d8309ac094 (patch) | |
| tree | 289944a26d27cafb8e1a91013b6cd4f6400cd6d0 /base/tracked_objects.cc | |
| parent | 517d1ccd28095c20530c0f91491c69e87df0dfea (diff) | |
| download | chromium_src-a21643a4c0c76665b8820caf3103e0d8309ac094.zip chromium_src-a21643a4c0c76665b8820caf3103e0d8309ac094.tar.gz chromium_src-a21643a4c0c76665b8820caf3103e0d8309ac094.tar.bz2 | |
Revert 107940 - Remove DCHECK that tickles TLS during shutdown
Repair busted tree.
TBR=rtenneti
Review URL: http://codereview.chromium.org/8425013
TBR=jar@chromium.org
Review URL: http://codereview.chromium.org/8430002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.cc')
| -rw-r--r-- | base/tracked_objects.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc index aba051ca..568fc41 100644 --- a/base/tracked_objects.cc +++ b/base/tracked_objects.cc @@ -207,6 +207,7 @@ void ThreadData::OnThreadTermination(void* thread_data) { if (!thread_data) return; reinterpret_cast<ThreadData*>(thread_data)->OnThreadTerminationCleanup(); + DCHECK_EQ(tls_index_.Get(), reinterpret_cast<ThreadData*>(NULL)); } void ThreadData::OnThreadTerminationCleanup() const { |