Add back a check for improper usage of IsOneTimeRandomizationEnabled.

base/metrics/field_trial.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/metrics/field_trial.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/sha1.h"
 #include "base/string_util.h"
@@ skipping 171 matching lines @@
   return BitsToOpenEndedUnitInterval(*bits);
 }
 
 //------------------------------------------------------------------------------
 // FieldTrialList methods and members.
 
 // static
 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;
   Time two_years_from_now =
       Time::NowFromSystemTime() + TimeDelta::FromDays(730);
   two_years_from_now.LocalExplode(&exploded);
   kExpirationYearInFuture = exploded.year;
 }
 
 FieldTrialList::~FieldTrialList() {
   AutoLock auto_lock(lock_);
   while (!registered_.empty()) {
     RegistrationList::iterator it = registered_.begin();
     it->second->Release();
     registered_.erase(it->first);
   }
   DCHECK_EQ(this, global_);
   global_ = NULL;
 }
 
 // static
 void FieldTrialList::Register(FieldTrial* trial) {
   if (!global_) {
-    register_without_global_ = true;
+    used_without_global_ = true;
     return;
   }
   AutoLock auto_lock(global_->lock_);
   DCHECK(!global_->PreLockedFind(trial->name()));
   trial->AddRef();
   global_->registered_[trial->name()] = trial;
 }
 
 // static
 FieldTrial* FieldTrialList::Find(const std::string& name) {
@@ skipping 128 matching lines @@
 // static
 size_t FieldTrialList::GetFieldTrialCount() {
   if (!global_)
     return 0;
   AutoLock auto_lock(global_->lock_);
   return global_->registered_.size();
 }
 
 // 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();
 }
 
 // static
 const std::string& FieldTrialList::client_id() {
   DCHECK(global_);
   if (!global_)
     return EmptyString();
 
   return global_->client_id_;
 }
 
 FieldTrial* FieldTrialList::PreLockedFind(const std::string& name) {
   RegistrationList::iterator it = registered_.find(name);
   if (registered_.end() == it)
     return NULL;
   return it->second;
 }
 
 }  // namespace base