summaryrefslogtreecommitdiffstats
path: root/base/tracked_objects.cc
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-31 07:26:16 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-31 07:26:16 +0000
commit862aa2f012c23229fe307c800c93318f15f32ba9 (patch)
tree668a34e2f25a89fe592a8d1fb39647bc9e08e221 /base/tracked_objects.cc
parent86440f533f6efca55ff112c93c6bab8839c797e2 (diff)
downloadchromium_src-862aa2f012c23229fe307c800c93318f15f32ba9.zip
chromium_src-862aa2f012c23229fe307c800c93318f15f32ba9.tar.gz
chromium_src-862aa2f012c23229fe307c800c93318f15f32ba9.tar.bz2
Avoid re-initializing object_tracker
...even if we're asked to do so in repetetive tests. BUG=31334 r=apavlov Review URL: http://codereview.chromium.org/515068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.cc')
-rw-r--r--base/tracked_objects.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
index a51c0da..bc259a2 100644
--- a/base/tracked_objects.cc
+++ b/base/tracked_objects.cc
@@ -18,6 +18,10 @@ namespace tracked_objects {
// static
TLSSlot ThreadData::tls_index_(base::LINKER_INITIALIZED);
+// A global state variable to prevent repeated initialization during tests.
+// static
+AutoTracking::State AutoTracking::state_ = AutoTracking::kNeverBeenRun;
+
//------------------------------------------------------------------------------
// Death data tallies durations when a death takes place.