Enable forced prerenders on wifi

chrome/browser/prerender/prerender_histograms.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 "chrome/browser/prerender/prerender_histograms.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 53 matching lines @@
     case ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN:
       return ComposeHistogramName("webcross", name);
     case ORIGIN_EXTERNAL_REQUEST:
       return ComposeHistogramName("externalrequest", name);
     case ORIGIN_INSTANT:
       return ComposeHistogramName("Instant", name);
     case ORIGIN_LINK_REL_NEXT:
       return ComposeHistogramName("webnext", name);
     case ORIGIN_GWS_PRERENDER:
       return ComposeHistogramName("gws", name);
-    case ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR:
+    case ORIGIN_EXTERNAL_REQUEST_FORCED_PRERENDER:
       return ComposeHistogramName("externalrequestforced", name);
     case ORIGIN_OFFLINE:
       return ComposeHistogramName("offline", name);
     default:
       NOTREACHED();
       break;
   }
 
   // Dummy return value to make the compiler happy.
   NOTREACHED();
@@ skipping 13 matching lines @@
 // Helper macros for origin-based histogram reporting. All HISTOGRAM arguments
 // must be UMA_HISTOGRAM... macros that contain an argument "name" which these
 // macros will eventually substitute for the actual name used.
 #define PREFIXED_HISTOGRAM(histogram_name, origin, HISTOGRAM)           \
   PREFIXED_HISTOGRAM_INTERNAL(origin, IsOriginWash(), HISTOGRAM, histogram_name)
 
 #define PREFIXED_HISTOGRAM_ORIGIN_EXPERIMENT(histogram_name, origin, \
                                              HISTOGRAM) \
   PREFIXED_HISTOGRAM_INTERNAL(origin, false, HISTOGRAM, histogram_name)
 
-#define PREFIXED_HISTOGRAM_INTERNAL(origin, wash, HISTOGRAM, histogram_name) \
-do { \
-  { \
-    /* Do not rename.  HISTOGRAM expects a local variable "name". */           \
-    std::string name = ComposeHistogramName(std::string(), histogram_name);    \
-    HISTOGRAM;                                                                 \
-  } \
-  /* Do not rename.  HISTOGRAM expects a local variable "name". */ \
-  std::string name = GetHistogramName(origin, wash, histogram_name); \
-  /* Branching because HISTOGRAM is caching the histogram into a static. */ \
-  if (wash) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_OMNIBOX) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_NONE) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_EXTERNAL_REQUEST) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_INSTANT) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_LINK_REL_NEXT) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR) { \
-    HISTOGRAM; \
-  } else if (origin == ORIGIN_OFFLINE) { \
-    HISTOGRAM; \
-  } else { \
-    HISTOGRAM; \
-  } \
-} while (0)
+#define PREFIXED_HISTOGRAM_INTERNAL(origin, wash, HISTOGRAM, histogram_name)  \
+  do {                                                                        \
+    {                                                                         \
+      /* Do not rename.  HISTOGRAM expects a local variable "name". */        \
+      std::string name = ComposeHistogramName(std::string(), histogram_name); \
+      HISTOGRAM;                                                              \
+    }                                                                         \
+    /* Do not rename.  HISTOGRAM expects a local variable "name". */          \
+    std::string name = GetHistogramName(origin, wash, histogram_name);        \
+    /* Branching because HISTOGRAM is caching the histogram into a static. */ \
+    if (wash) {                                                               \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_OMNIBOX) {                                    \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_NONE) {                                       \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN) {              \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN) {             \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_EXTERNAL_REQUEST) {                           \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_INSTANT) {                                    \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_LINK_REL_NEXT) {                              \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_EXTERNAL_REQUEST_FORCED_PRERENDER) {          \
+      HISTOGRAM;                                                              \
+    } else if (origin == ORIGIN_OFFLINE) {                                    \
+      HISTOGRAM;                                                              \
+    } else {                                                                  \
+      HISTOGRAM;                                                              \
+    }                                                                         \
+  } while (0)
 
 PrerenderHistograms::PrerenderHistograms()
     : last_origin_(ORIGIN_MAX),
       origin_wash_(false),
       seen_any_pageload_(true),
       seen_pageload_started_after_prerender_(true) {
 }
 
 void PrerenderHistograms::RecordPrerender(Origin origin, const GURL& url) {
   // We need to update last_origin_ and origin_wash_.
@@ skipping 323 matching lines @@
                                 base::TimeDelta::FromMinutes(2), 50);
 }
 
 bool PrerenderHistograms::IsOriginWash() const {
   if (!WithinWindow())
     return false;
   return origin_wash_;
 }
 
 }  // namespace prerender