Add back a check for improper usage of IsOneTimeRandomizationEnabled.

Add back a check for improper usage of IsOneTimeRandomizationEnabled.

BUG=none
TEST=existing

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=90135

[Jói, 2011-06-20 22:22:42]

gentle ping

On Fri, Jun 17, 2011 at 11:26 AM,  <joi@chromium.org> wrote:
> Reviewers: jar,
>
> Description:
> Add back a check for improper usage of IsOneTimeRandomizationEnabled.
>
> BUG=none
> TEST=existing
>
>
> Please review this at http://codereview.chromium.org/7204004/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M base/metrics/field_trial.h
>  M base/metrics/field_trial.cc
>
>
> Index: base/metrics/field_trial.cc
> diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
> index
>
190ebcf0254a2bb0021464e8659100d423585106..2c87f073492e66cbb01d8303abb34155945b766e
> 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();
>  }
> Index: base/metrics/field_trial.h
> diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
> index
>
4e89ccf693806a99e1acdbbfc4c4f6bf292eefba..3b831d8fc4d72c03b972ae3c1227e8e9ab6dc64f
> 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
>
>
>

[jar (doing other things), 2011-06-20 23:53:18]

LGTM

Thanks!