Add back a check for improper usage of IsOneTimeRandomizationEnabled.

BUG=none
TEST=existing

Review URL: http://codereview.chromium.org/7204004

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

2 files changed, 11 insertions, 11 deletions

diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
index 190ebcf..2c87f07 100644
--- a/base/metrics/field_trial.cc
+++ b/base/metrics/field_trial.cc
@@ -189,14 +189,14 @@ double FieldTrial::HashClientId(const std::string& client_id,
 FieldTrialList* FieldTrialList::global_ = NULL;
 
 // static
-bool FieldTrialList::register_without_global_ = false;
+bool FieldTrialList::used_without_global_ = false;
 
 FieldTrialList::FieldTrialList(const std::string& client_id)
     : application_start_time_(TimeTicks::Now()),
       client_id_(client_id),
       observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
   DCHECK(!global_);
-  DCHECK(!register_without_global_);
+  DCHECK(!used_without_global_);
   global_ = this;
 
   Time::Exploded exploded;
@@ -220,7 +220,7 @@ FieldTrialList::~FieldTrialList() {
 // static
 void FieldTrialList::Register(FieldTrial* trial) {
   if (!global_) {
-    register_without_global_ = true;
+    used_without_global_ = true;
     return;
   }
   AutoLock auto_lock(global_->lock_);
@@ -369,11 +369,10 @@ size_t FieldTrialList::GetFieldTrialCount() {
 
 // static
 bool FieldTrialList::IsOneTimeRandomizationEnabled() {
-  // TODO(joi): Put back a DCHECK(global_) here.  First, need to make sure all
-  // unit test executables have exactly one FieldTrialList instance (currently
-  // they have 0 or 1).
-  if (!global_)
+  if (!global_) {
+    used_without_global_ = true;
     return false;
+  }
 
   return !global_->client_id_.empty();
 }
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index 4e89ccf..3b831d8 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -364,10 +364,11 @@ class BASE_API FieldTrialList {
 
   static FieldTrialList* global_;  // The singleton of this class.
 
-  // This will tell us if there is an attempt to register a field trial without
-  // creating the FieldTrialList. This is not an error, unless a FieldTrialList
-  // is created after that.
-  static bool register_without_global_;
+  // This will tell us if there is an attempt to register a field
+  // trial or check if one-time randomization is enabled without
+  // creating the FieldTrialList. This is not an error, unless a
+  // FieldTrialList is created after that.
+  static bool used_without_global_;
 
   // A helper value made available to users, that shows when the FieldTrialList
   // was initialized.  Note that this is a singleton instance, and hence is a