 Chromium Code Reviews
 Chromium Code Reviews Issue 2537503002:
  [Prerender] Get the prerender mode from Finch field trial.  (Closed)
    
  
    Issue 2537503002:
  [Prerender] Get the prerender mode from Finch field trial.  (Closed) 
  | Index: chrome/browser/prerender/prerender_field_trial.cc | 
| diff --git a/chrome/browser/prerender/prerender_field_trial.cc b/chrome/browser/prerender/prerender_field_trial.cc | 
| index a726394b3f61bfbfd140f113c93fa818a43328e1..c1205b377b807879756a1903c80a0ec643685273 100644 | 
| --- a/chrome/browser/prerender/prerender_field_trial.cc | 
| +++ b/chrome/browser/prerender/prerender_field_trial.cc | 
| @@ -6,37 +6,37 @@ | 
| #include <string> | 
| -#include "base/command_line.h" | 
| #include "base/logging.h" | 
| #include "base/metrics/field_trial.h" | 
| #include "chrome/browser/prerender/prerender_manager.h" | 
| #include "chrome/common/chrome_switches.h" | 
| +#include "components/variations/variations_associated_data.h" | 
| namespace prerender { | 
| -void ConfigurePrerender(const base::CommandLine& command_line) { | 
| +const base::Feature kNoStatePrefetchFeature{"NoStatePrefetch", | 
| + base::FEATURE_ENABLED_BY_DEFAULT}; | 
| 
pasko
2016/12/01 16:47:58
maybe disabled by default?
 
droger
2016/12/01 17:17:40
No, it is enabled by default (but in "Prerender" m
 
pasko
2016/12/01 17:30:44
I think the general ideology of a Feature is to ha
 
droger
2016/12/01 17:39:49
I think it would be even more confusing, but that
 
droger
2016/12/01 17:48:27
Also in my mind, in the long term we would not rem
 | 
| + | 
| +void ConfigurePrerender() { | 
| PrerenderManager::PrerenderManagerMode mode = | 
| PrerenderManager::PRERENDER_MODE_ENABLED; | 
| - if (command_line.HasSwitch(switches::kPrerenderMode)) { | 
| - const std::string switch_value = | 
| - command_line.GetSwitchValueASCII(switches::kPrerenderMode); | 
| - | 
| - if (switch_value == switches::kPrerenderModeSwitchValueDisabled) { | 
| - mode = PrerenderManager::PRERENDER_MODE_DISABLED; | 
| - } else if (switch_value == switches::kPrerenderModeSwitchValuePrefetch) { | 
| + if (!base::FeatureList::IsEnabled(kNoStatePrefetchFeature)) { | 
| + mode = PrerenderManager::PRERENDER_MODE_DISABLED; | 
| + } else { | 
| + std::string mode_value = variations::GetVariationParamValueByFeature( | 
| + kNoStatePrefetchFeature, "mode"); | 
| + if (mode_value == "no_state_prefetch") { | 
| mode = PrerenderManager::PRERENDER_MODE_NOSTATE_PREFETCH; | 
| - } else if (switch_value.empty() || | 
| - switch_value == switches::kPrerenderModeSwitchValueEnabled) { | 
| + } else if (mode_value.empty() || mode_value == "prerender") { | 
| // The empty string means the option was provided with no value, and that | 
| // means enable. | 
| mode = PrerenderManager::PRERENDER_MODE_ENABLED; | 
| - } else if (switch_value == switches::kPrerenderModeSwitchValueSimpleLoad) { | 
| + } else if (mode_value == "simple_load") { | 
| mode = PrerenderManager::PRERENDER_MODE_SIMPLE_LOAD_EXPERIMENT; | 
| } else { | 
| - mode = PrerenderManager::PRERENDER_MODE_DISABLED; | 
| - LOG(ERROR) << "Invalid --prerender option received on command line: " | 
| - << switch_value; | 
| + LOG(ERROR) << "Invalid prerender mode: " << mode_value; | 
| LOG(ERROR) << "Disabling prerendering!"; | 
| + mode = PrerenderManager::PRERENDER_MODE_DISABLED; | 
| } | 
| } |