Adding a fourth omnibox prerender experiment.

chrome/browser/prerender/prerender_histograms.cc

 // Copyright (c) 2011 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 "chrome/browser/prerender/prerender_histograms.h"
 
 #include <string>
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 11 matching lines @@
                                  const std::string& name) {
   if (prefix_type.empty())
     return std::string("Prerender.") + name;
   return std::string("Prerender.") + prefix_type + std::string("_") + name;
 }
 
 std::string GetHistogramName(Origin origin, uint8 experiment_id,
                              bool is_wash, const std::string& name) {
   if (is_wash)
     return ComposeHistogramName("wash", name);
+
+  if (origin == ORIGIN_GWS_PRERENDER) {
+    if (experiment_id == kNoExperiment)
+      return ComposeHistogramName("gws", name);
+    return ComposeHistogramName("exp" + std::string(1, experiment_id + '0'),
+                                name);
+  }
+
+  if (experiment_id != kNoExperiment)
+    return ComposeHistogramName("wash", name);
+
   switch (origin) {
     case ORIGIN_OMNIBOX_ORIGINAL:
-      if (experiment_id != kNoExperiment)
-        return ComposeHistogramName("wash", name);
       return ComposeHistogramName("omnibox_original", name);
     case ORIGIN_OMNIBOX_CONSERVATIVE:
-      if (experiment_id != kNoExperiment)
-        return ComposeHistogramName("wash", name);
       return ComposeHistogramName("omnibox_conservative", name);
     case ORIGIN_OMNIBOX_EXACT:
-      if (experiment_id != kNoExperiment)
-        return ComposeHistogramName("wash", name);
       return ComposeHistogramName("omnibox_exact", name);
+    case ORIGIN_OMNIBOX_EXACT_FULL:
+      return ComposeHistogramName("omnibox_exact_full", name);
     case ORIGIN_LINK_REL_PRERENDER:
-      if (experiment_id != kNoExperiment)
-        return ComposeHistogramName("wash", name);
       return ComposeHistogramName("web", name);
-    case ORIGIN_GWS_PRERENDER:
-      if (experiment_id == kNoExperiment)
-        return ComposeHistogramName("gws", name);
-      return ComposeHistogramName("exp" + std::string(1, experiment_id + '0'),
-                                  name);
+    case ORIGIN_GWS_PRERENDER:  // Handled above.
     default:
       NOTREACHED();
       break;
   };
 
   // Dummy return value to make the compiler happy.
   NOTREACHED();
   return ComposeHistogramName("wash", name);
 }
 
@@ skipping 26 matching lines @@
   static uint8 recording_experiment = kNoExperiment; \
   if (recording_experiment == kNoExperiment && experiment != kNoExperiment) \
     recording_experiment = experiment; \
   if (wash) { \
     HISTOGRAM; \
   } else if (experiment != kNoExperiment && \
              (origin != ORIGIN_GWS_PRERENDER || \
               experiment != recording_experiment)) { \
   } else if (origin == ORIGIN_LINK_REL_PRERENDER) { \
     HISTOGRAM; \
-  } else if (origin == ORIGIN_OMNIBOX_ORIGINAL) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_OMNIBOX_CONSERVATIVE) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_OMNIBOX_EXACT) { \
+  } else if (origin == ORIGIN_OMNIBOX_ORIGINAL || \
+             origin == ORIGIN_OMNIBOX_CONSERVATIVE || \
+             origin == ORIGIN_OMNIBOX_EXACT || \
+             origin == ORIGIN_OMNIBOX_EXACT_FULL) { \
     HISTOGRAM; \
   } else if (experiment != kNoExperiment) { \
     HISTOGRAM; \
   } else { \
     HISTOGRAM; \
   } \
 }
 
 PrerenderHistograms::PrerenderHistograms()
     : last_experiment_id_(kNoExperiment),
@@ skipping 156 matching lines @@
   return last_origin_;
 }
 
 bool PrerenderHistograms::IsOriginExperimentWash() const {
   if (!WithinWindow())
     return false;
   return origin_experiment_wash_;
 }
 
 }  // namespace prerender