summaryrefslogtreecommitdiffstats
path: root/base/metrics
diff options
context:
space:
mode:
authorgavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 19:36:54 +0000
committergavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 19:36:54 +0000
commit6de6d7feb7c7417b1be0d33b32341212a068edf8 (patch)
tree177855802e53d448882042a19b31f91b3c197601 /base/metrics
parentd9fdda73444a418dbfef1324b986f4162a78eadc (diff)
downloadchromium_src-6de6d7feb7c7417b1be0d33b32341212a068edf8.zip
chromium_src-6de6d7feb7c7417b1be0d33b32341212a068edf8.tar.gz
chromium_src-6de6d7feb7c7417b1be0d33b32341212a068edf8.tar.bz2
Rename base::FieldTrialList::RegistrationList --> RegistrationMap.
The typedef confused me when I was reading the code, so here I am, fixing it. BUG=None R=jar@chromium.org Review URL: https://codereview.chromium.org/120013002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
-rw-r--r--base/metrics/field_trial.cc6
-rw-r--r--base/metrics/field_trial.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
index b99f314..f718ab0 100644
--- a/base/metrics/field_trial.cc
+++ b/base/metrics/field_trial.cc
@@ -252,7 +252,7 @@ FieldTrialList::FieldTrialList(
FieldTrialList::~FieldTrialList() {
AutoLock auto_lock(lock_);
while (!registered_.empty()) {
- RegistrationList::iterator it = registered_.begin();
+ RegistrationMap::iterator it = registered_.begin();
it->second->Release();
registered_.erase(it->first);
}
@@ -390,7 +390,7 @@ void FieldTrialList::GetActiveFieldTrialGroups(
return;
AutoLock auto_lock(global_->lock_);
- for (RegistrationList::iterator it = global_->registered_.begin();
+ for (RegistrationMap::iterator it = global_->registered_.begin();
it != global_->registered_.end(); ++it) {
FieldTrial::ActiveGroup active_group;
if (it->second->GetActiveGroup(&active_group))
@@ -513,7 +513,7 @@ const FieldTrial::EntropyProvider*
}
FieldTrial* FieldTrialList::PreLockedFind(const std::string& name) {
- RegistrationList::iterator it = registered_.find(name);
+ RegistrationMap::iterator it = registered_.find(name);
if (registered_.end() == it)
return NULL;
return it->second;
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index 70ce2f9..5a4375e 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -441,7 +441,7 @@ class BASE_EXPORT FieldTrialList {
private:
// A map from FieldTrial names to the actual instances.
- typedef std::map<std::string, FieldTrial*> RegistrationList;
+ typedef std::map<std::string, FieldTrial*> RegistrationMap;
// If one-time randomization is enabled, returns a weak pointer to the
// corresponding EntropyProvider. Otherwise, returns NULL.
@@ -466,7 +466,7 @@ class BASE_EXPORT FieldTrialList {
// Lock for access to registered_.
base::Lock lock_;
- RegistrationList registered_;
+ RegistrationMap registered_;
// Entropy provider to be used for one-time randomized field trials. If NULL,
// one-time randomization is not supported.