Place field trial name at the end (as a suffix).

For consistency in how histograms are usually named.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/8015016

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

3 files changed, 10 insertions, 14 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index 8d1a363..7f892a9 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -864,9 +864,8 @@ void AutocompleteController::Start(
   if (matches_requested == AutocompleteInput::ALL_MATCHES &&
       (text.length() < 6)) {
     base::TimeTicks end_time = base::TimeTicks::Now();
-    std::string name = "Omnibox.QueryTime." +
-                       InstantFieldTrial::GetGroupName(profile_) + "." +
-                       base::IntToString(text.length());
+    std::string name = "Omnibox.QueryTime." + base::IntToString(text.length())
+                       + InstantFieldTrial::GetGroupName(profile_);
     base::Histogram* counter = base::Histogram::FactoryGet(
         name, 1, 1000, 50, base::Histogram::kUmaTargetedHistogramFlag);
     counter->Add(static_cast<int>((end_time - start_time).InMilliseconds()));
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 695a796..5dadb5d 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -156,11 +156,8 @@ void InstantController::Disable(Profile* profile) {
                                 delta.InMinutes(), 1, 60 * 24 * 10, 50);
   }
 
-  if (InstantFieldTrial::IsExperimentGroup(profile)) {
-    UMA_HISTOGRAM_COUNTS(
-        "Instant.FieldTrialOptOut." + InstantFieldTrial::GetGroupName(profile),
-        1);
-  }
+  UMA_HISTOGRAM_COUNTS(
+      "Instant.OptOut" + InstantFieldTrial::GetGroupName(profile), 1);
 
   service->SetBoolean(prefs::kInstantEnabledOnce, true);
   service->SetBoolean(prefs::kInstantEnabled, false);
diff --git a/chrome/browser/instant/instant_field_trial.cc b/chrome/browser/instant/instant_field_trial.cc
index 7cbf61e..dc68ac9 100644
--- a/chrome/browser/instant/instant_field_trial.cc
+++ b/chrome/browser/instant/instant_field_trial.cc
@@ -74,14 +74,14 @@ bool InstantFieldTrial::IsExperimentGroup(Profile* profile) {
 // static
 std::string InstantFieldTrial::GetGroupName(Profile* profile) {
   switch (GetGroup(profile)) {
-    case INACTIVE:    return "InstantInactive";
-    case CONTROL1:    return "InstantControl1";
-    case CONTROL2:    return "InstantControl2";
-    case EXPERIMENT1: return "InstantExperiment1";
-    case EXPERIMENT2: return "InstantExperiment2";
+    case INACTIVE:    return std::string();
+    case CONTROL1:    return "_InstantControl1";
+    case CONTROL2:    return "_InstantControl2";
+    case EXPERIMENT1: return "_InstantExperiment1";
+    case EXPERIMENT2: return "_InstantExperiment2";
   }
   NOTREACHED();
-  return "InstantUnknown";
+  return std::string();
 }
 
 // static