Update order of FieldTrial functions.

Puts the static functions together and
moves the constructor to be in the same
order in the .cc file as in the .h file.

No logic changes.

BUG=none

Review URL: https://codereview.chromium.org/51233003

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

2 files changed, 29 insertions, 29 deletions

diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
index 03b63dc..b99f314 100644
--- a/base/metrics/field_trial.cc
+++ b/base/metrics/field_trial.cc
@@ -72,26 +72,6 @@ int FieldTrialList::kNoExpirationYear = 0;
 //------------------------------------------------------------------------------
 // FieldTrial methods and members.
 
-FieldTrial::FieldTrial(const std::string& trial_name,
-                       const Probability total_probability,
-                       const std::string& default_group_name,
-                       double entropy_value)
-    : trial_name_(trial_name),
-      divisor_(total_probability),
-      default_group_name_(default_group_name),
-      random_(GetGroupBoundaryValue(total_probability, entropy_value)),
-      accumulated_group_probability_(0),
-      next_group_number_(kDefaultGroupNumber + 1),
-      group_(kNotFinalized),
-      enable_field_trial_(true),
-      forced_(false),
-      group_reported_(false),
-      trial_registered_(false) {
-  DCHECK_GT(total_probability, 0);
-  DCHECK(!trial_name_.empty());
-  DCHECK(!default_group_name_.empty());
-}
-
 FieldTrial::EntropyProvider::~EntropyProvider() {
 }
 
@@ -159,12 +139,6 @@ const std::string& FieldTrial::group_name() {
   return group_name_;
 }
 
-// static
-void FieldTrial::EnableBenchmarking() {
-  DCHECK_EQ(0u, FieldTrialList::GetFieldTrialCount());
-  enable_benchmarking_ = true;
-}
-
 void FieldTrial::SetForced() {
   // We might have been forced before (e.g., by CreateFieldTrial) and it's
   // first come first served, e.g., command line switch has precedence.
@@ -177,6 +151,12 @@ void FieldTrial::SetForced() {
 }
 
 // static
+void FieldTrial::EnableBenchmarking() {
+  DCHECK_EQ(0u, FieldTrialList::GetFieldTrialCount());
+  enable_benchmarking_ = true;
+}
+
+// static
 FieldTrial* FieldTrial::CreateSimulatedFieldTrial(
     const std::string& trial_name,
     Probability total_probability,
@@ -186,6 +166,26 @@ FieldTrial* FieldTrial::CreateSimulatedFieldTrial(
                         entropy_value);
 }
 
+FieldTrial::FieldTrial(const std::string& trial_name,
+                       const Probability total_probability,
+                       const std::string& default_group_name,
+                       double entropy_value)
+    : trial_name_(trial_name),
+      divisor_(total_probability),
+      default_group_name_(default_group_name),
+      random_(GetGroupBoundaryValue(total_probability, entropy_value)),
+      accumulated_group_probability_(0),
+      next_group_number_(kDefaultGroupNumber + 1),
+      group_(kNotFinalized),
+      enable_field_trial_(true),
+      forced_(false),
+      group_reported_(false),
+      trial_registered_(false) {
+  DCHECK_GT(total_probability, 0);
+  DCHECK(!trial_name_.empty());
+  DCHECK(!default_group_name_.empty());
+}
+
 FieldTrial::~FieldTrial() {}
 
 void FieldTrial::SetTrialRegistered() {
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index 0a389d3..70ce2f9 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -140,9 +140,6 @@ class BASE_EXPORT FieldTrial : public RefCounted<FieldTrial> {
   // is used as the group name. This causes a winner to be chosen if none was.
   const std::string& group_name();
 
-  // Enable benchmarking sets field trials to a common setting.
-  static void EnableBenchmarking();
-
   // Set the field trial as forced, meaning that it was setup earlier than
   // the hard coded registration of the field trial to override it.
   // This allows the code that was hard coded to register the field trial to
@@ -153,6 +150,9 @@ class BASE_EXPORT FieldTrial : public RefCounted<FieldTrial> {
   // be done from the UI thread.
   void SetForced();
 
+  // Enable benchmarking sets field trials to a common setting.
+  static void EnableBenchmarking();
+
   // Creates a FieldTrial object with the specified parameters, to be used for
   // simulation of group assignment without actually affecting global field
   // trial state in the running process. Group assignment will be done based on