From 86dc25f56d7b1b379faedfc215f22f0fba3d5db6 Mon Sep 17 00:00:00 2001 From: "sky@google.com" Date: Fri, 23 Jan 2009 16:05:58 +0000 Subject: Decrements FieldTrialList::constructor_count_ in the destructor. I'm going to run ui tests in process and call BrowserMain multiple times. That means FieldTrialList's constructor is run multiple times. Without this decrement, the constructor isn't happy. BUG=none TEST=none Review URL: http://codereview.chromium.org/18535 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8554 0039d316-1c4b-4281-b951-d872f2087c98 --- base/field_trial.cc | 6 +----- base/field_trial.h | 4 ---- base/field_trial_unittest.cc | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'base') diff --git a/base/field_trial.cc b/base/field_trial.cc index 9fd9d8f..c88ab65 100644 --- a/base/field_trial.cc +++ b/base/field_trial.cc @@ -15,13 +15,9 @@ using base::Time; // static FieldTrialList* FieldTrialList::global_ = NULL; -// static -int FieldTrialList::constructor_count_ = 0; - FieldTrialList::FieldTrialList() : application_start_time_(Time::Now()) { - DCHECK(!constructor_count_); - ++constructor_count_; + DCHECK(!global_); global_ = this; } diff --git a/base/field_trial.h b/base/field_trial.h index 99e213c..f392f88 100644 --- a/base/field_trial.h +++ b/base/field_trial.h @@ -80,11 +80,7 @@ class FieldTrialList : NonThreadSafe { private: typedef std::map RegistrationList; - friend class FieldTrialTest; - static void ResetConstructorCountForTestingOnly() { constructor_count_ = 0; } - static FieldTrialList* global_; // The singleton of this class. - static int constructor_count_; // Prevent having more than one. base::Time application_start_time_; RegistrationList registered_; diff --git a/base/field_trial_unittest.cc b/base/field_trial_unittest.cc index 3d8c0e2..f7be7e0 100644 --- a/base/field_trial_unittest.cc +++ b/base/field_trial_unittest.cc @@ -12,7 +12,6 @@ class FieldTrialTest : public testing::Test { public: FieldTrialTest() : trial_list_() { } - ~FieldTrialTest() { FieldTrialList::ResetConstructorCountForTestingOnly(); } private: FieldTrialList trial_list_; -- cgit v1.1