FieldTrial - Use ObserverListThreadSafe instead of

base/metrics/field_trial.cc

 // Copyright (c) 2012 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/build_time.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/sha1.h"
@@ skipping 195 matching lines @@
 
 // static
 FieldTrialList* FieldTrialList::global_ = NULL;
 
 // static
 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) {
+      observer_list_(new ObserverListThreadSafe<FieldTrialList::Observer>(
+          ObserverListBase<FieldTrialList::Observer>::NOTIFY_EXISTING_ONLY)) {
   DCHECK(!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;
 }
@@ skipping 159 matching lines @@
   field_trial->forced_ = true;
   FieldTrialList::Register(field_trial);
   return field_trial;
 }
 
 // static
 void FieldTrialList::AddObserver(Observer* observer) {
   if (!global_)
     return;
   DCHECK(global_);
-  global_->observer_list_.AddObserver(observer);
+  global_->observer_list_->AddObserver(observer);
 }
 
 // static
 void FieldTrialList::RemoveObserver(Observer* observer) {
   if (!global_)
     return;
   DCHECK(global_);
-  global_->observer_list_.RemoveObserver(observer);
+  global_->observer_list_->RemoveObserver(observer);
 }
 
 // static
 void FieldTrialList::NotifyFieldTrialGroupSelection(
     const std::string& name,
     const std::string& group_name) {
   if (!global_)
     return;
   DCHECK(global_);
-  FOR_EACH_OBSERVER(Observer,
-                    global_->observer_list_,
-                    OnFieldTrialGroupFinalized(name, group_name));
+  global_->observer_list_->Notify(
+      &FieldTrialList::Observer::OnFieldTrialGroupFinalized,
+      name,
+      group_name);
 }
 
 // static
 size_t FieldTrialList::GetFieldTrialCount() {
   if (!global_)
     return 0;
   AutoLock auto_lock(global_->lock_);
   return global_->registered_.size();
 }
 
@@ skipping 29 matching lines @@
     used_without_global_ = true;
     return;
   }
   AutoLock auto_lock(global_->lock_);
   DCHECK(!global_->PreLockedFind(trial->name()));
   trial->AddRef();
   global_->registered_[trial->name()] = trial;
 }
 
 }  // namespace base