Commit c84819af authored by Sebastien Marchand's avatar Sebastien Marchand Committed by Commit Bot

Switch tab_manager_features to the FeatureParams API

This is a cleanup that replaces the really long feature parameters names
used in tab_manager_features.h/cc by several FeatureParam objects.


Bug: 844426
Change-Id: Ia37d00d2de3f0ff756fa365108bbcab4a91d184c
Reviewed-on: https://chromium-review.googlesource.com/1195852Reviewed-by: default avatarChris Hamilton <chrisha@chromium.org>
Reviewed-by: default avatarAlexei Svitkine <asvitkine@chromium.org>
Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591360}
parent b074c3fe
......@@ -1218,13 +1218,13 @@ const FeatureEntry::FeatureVariation
#if !defined(OS_ANDROID)
const FeatureEntry::FeatureParam kProactiveTabFreezeAndDiscard_FreezeOnly[] = {
{resource_coordinator::
kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam,
{resource_coordinator::ProactiveTabFreezeAndDiscardParams::
kShouldProactivelyDiscard.name,
"false"}};
const FeatureEntry::FeatureParam
kProactiveTabFreezeAndDiscard_FreezeAndDiscard[] = {
{resource_coordinator::
kProactiveTabFreezeAndDiscard_ShouldProactivelyDiscardParam,
{resource_coordinator::ProactiveTabFreezeAndDiscardParams::
kShouldProactivelyDiscard.name,
"true"}};
const FeatureEntry::FeatureVariation kProactiveTabFreezeAndDiscardVariations[] =
{{"Freeze only", kProactiveTabFreezeAndDiscard_FreezeOnly,
......@@ -4235,7 +4235,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_WITH_PARAMS_VALUE_TYPE(
features::kProactiveTabFreezeAndDiscard,
kProactiveTabFreezeAndDiscardVariations,
resource_coordinator::kProactiveTabFreezeAndDiscardFeatureName)},
features::kProactiveTabFreezeAndDiscard.name)},
{"site-characteristics-database",
flag_descriptions::kSiteCharacteristicsDatabaseName,
flag_descriptions::kSiteCharacteristicsDatabaseDescription, kOsDesktop,
......
......@@ -350,16 +350,20 @@ TEST_F(TabLoaderTest, DelegatePolicyIsApplied) {
// it such that there are 2 max simultaneous tab loads, and 3 maximum tabs to
// restore.
std::map<std::string, std::string> params;
params[rc::kInfiniteSessionRestore_MinSimultaneousTabLoads] = "2";
params[rc::kInfiniteSessionRestore_MaxSimultaneousTabLoads] = "2";
params[rc::kInfiniteSessionRestore_CoresPerSimultaneousTabLoad] = "0";
params[rc::kInfiniteSessionRestore_MinTabsToRestore] = "1";
params[rc::kInfiniteSessionRestore_MaxTabsToRestore] = "3";
params[rc::InfiniteSessionRestoreParams::kMinSimultaneousTabLoads.name] = "2";
params[rc::InfiniteSessionRestoreParams::kMaxSimultaneousTabLoads.name] = "2";
params[rc::InfiniteSessionRestoreParams::kCoresPerSimultaneousTabLoad.name] =
"0";
params[rc::InfiniteSessionRestoreParams::kMinTabsToRestore.name] = "1";
params[rc::InfiniteSessionRestoreParams::kMaxTabsToRestore.name] = "3";
// Disable these policy features.
params[rc::kInfiniteSessionRestore_MbFreeMemoryPerTabToRestore] = "0";
params[rc::kInfiniteSessionRestore_MaxTimeSinceLastUseToRestore] = "0";
params[rc::kInfiniteSessionRestore_MinSiteEngagementToRestore] = "0";
params[rc::InfiniteSessionRestoreParams::kMbFreeMemoryPerTabToRestore.name] =
"0";
params[rc::InfiniteSessionRestoreParams::kMaxTimeSinceLastUseToRestore.name] =
"0";
params[rc::InfiniteSessionRestoreParams::kMinSiteEngagementToRestore.name] =
"0";
variations::testing::VariationParamsManager variations_manager;
variations_manager.SetVariationParamsWithFeatureAssociations(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment