Various Prerender Service / Prerender LocalPredictor related changes.

chrome/browser/prerender/prerender_field_trial.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_field_trial.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 26 matching lines @@
 const char kDisabledGroup[] = "Disabled";
 const char kEnabledGroup[] = "Enabled";
 
 const char kLocalPredictorSpecTrialName[] = "PrerenderLocalPredictorSpec";
 const char kLocalPredictorKeyName[] = "LocalPredictor";
 const char kLocalPredictorUnencryptedSyncOnlyKeyName[] =
     "LocalPredictorUnencryptedSyncOnly";
 const char kSideEffectFreeWhitelistKeyName[] = "SideEffectFreeWhitelist";
 const char kPrerenderLaunchKeyName[] = "PrerenderLaunch";
 const char kPrerenderAlwaysControlKeyName[] = "PrerenderAlwaysControl";
+const char kPrerenderPrefetchKeyName[] = "PrerenderPrefetch";
 const char kPrerenderQueryPrerenderServiceKeyName[] =
     "PrerenderQueryPrerenderService";
 const char kPrerenderQueryPrerenderServiceCurrentURLKeyName[] =
     "PrerenderQueryPrerenderServiceCurrentURL";
 const char kPrerenderQueryPrerenderServiceCandidateURLsKeyName[] =
     "PrerenderQueryPrerenderServiceCandidateURLs";
 const char kPrerenderServiceBehaviorIDKeyName[] = "PrerenderServiceBehaviorID";
 const char kPrerenderServiceFetchTimeoutKeyName[] =
     "PrerenderServiceFetchTimeoutMs";
 const char kPrerenderTTLKeyName[] = "PrerenderTTLSeconds";
 const char kPrerenderPriorityHalfLifeTimeKeyName[] =
     "PrerenderPriorityHalfLifeTimeSeconds";
 const char kMaxConcurrentPrerenderKeyName[] = "MaxConcurrentPrerenders";
+const char kMaxLaunchPrerenderKeyName[] = "MaxLaunchPrerenders";
 const char kSkipFragment[] = "SkipFragment";
 const char kSkipHTTPS[] = "SkipHTTPS";
 const char kSkipWhitelist[] = "SkipWhitelist";
 const char kSkipServiceWhitelist[] = "SkipServiceWhitelist";
 const char kSkipLoggedIn[] = "SkipLoggedIn";
 const char kSkipDefaultNoPrerender[] = "SkipDefaultNoPrerender";
 const char kPrerenderServiceURLPrefixParameterName[] =
     "PrerenderServiceURLPrefix";
 const char kDefaultPrerenderServiceURLPrefix[] =
     "https://clients4.google.com/prerenderservice/?q=";
@@ skipping 251 matching lines @@
   return IsLocalPredictorEnabled() &&
       GetLocalPredictorSpecValue(kSideEffectFreeWhitelistKeyName) !=
       kDisabledGroup;
 }
 
 bool IsLocalPredictorPrerenderLaunchEnabled() {
   return GetLocalPredictorSpecValue(kPrerenderLaunchKeyName) != kDisabledGroup;
 }
 
 bool IsLocalPredictorPrerenderAlwaysControlEnabled() {
-  return GetLocalPredictorSpecValue(kPrerenderAlwaysControlKeyName) ==
+  // If we prefetch rather than prerender, we automatically also prerender
+  // as a control group only.
+  return (GetLocalPredictorSpecValue(kPrerenderAlwaysControlKeyName) ==
+          kEnabledGroup) || IsLocalPredictorPrerenderPrefetchEnabled();
+}
+
+bool IsLocalPredictorPrerenderPrefetchEnabled() {
+  return GetLocalPredictorSpecValue(kPrerenderPrefetchKeyName) ==
       kEnabledGroup;
 }
 
 bool ShouldQueryPrerenderService(Profile* profile) {
   return IsUnencryptedSyncEnabled(profile) &&
       GetLocalPredictorSpecValue(kPrerenderQueryPrerenderServiceKeyName) ==
       kEnabledGroup;
 }
 
 bool ShouldQueryPrerenderServiceForCurrentURL() {
@@ skipping 47 matching lines @@
 }
 
 int GetLocalPredictorMaxConcurrentPrerenders() {
   int num_prerenders;
   StringToInt(GetLocalPredictorSpecValue(kMaxConcurrentPrerenderKeyName),
               &num_prerenders);
   // Sanity check: Ensure the number of prerenders is between 1 and 10.
   return std::min(std::max(num_prerenders, 1), 10);
 }
 
+int GetLocalPredictorMaxLaunchPrerenders() {
+  int num_prerenders;
+  StringToInt(GetLocalPredictorSpecValue(kMaxLaunchPrerenderKeyName),
+              &num_prerenders);
+  // Sanity check: Ensure the number of prerenders is between 1 and 10.
+  return std::min(std::max(num_prerenders, 1), 10);
+}
+
 bool SkipLocalPredictorFragment() {
   return GetLocalPredictorSpecValue(kSkipFragment) == kEnabledGroup;
 }
 
 bool SkipLocalPredictorHTTPS() {
   return GetLocalPredictorSpecValue(kSkipHTTPS) == kEnabledGroup;
 }
 
 bool SkipLocalPredictorWhitelist() {
   return GetLocalPredictorSpecValue(kSkipWhitelist) == kEnabledGroup;
@@ skipping 25 matching lines @@
   return GetLocalPredictorSpecValue(kDisableSessionStorageNamespaceMerging) !=
       kDisabledGroup;
 }
 
 bool IsPrerenderCookieStoreEnabled() {
   return GetLocalPredictorSpecValue(kPrerenderCookieStore) != kDisabledGroup &&
       FieldTrialList::FindFullName(kPrerenderCookieStore) != kDisabledGroup;
 }
 
 }  // namespace prerender