diff options
| author | georgesak <georgesak@chromium.org> | 2016-02-01 12:41:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-01 20:43:47 +0000 |
| commit | 4b18781cb26dbb522e2968a773ce00d7590b7f4b (patch) | |
| tree | 373e3d5cab4ca697d07cb0cfa3135387885f31d7 | |
| parent | d029fcbbe473705ad97c4bc6680a34d38c0b43b7 (diff) | |
| download | chromium_src-4b18781cb26dbb522e2968a773ce00d7590b7f4b.zip chromium_src-4b18781cb26dbb522e2968a773ce00d7590b7f4b.tar.gz chromium_src-4b18781cb26dbb522e2968a773ce00d7590b7f4b.tar.bz2 | |
Add missing parameter to AutomaticTabDiscarding experiment in testing config.
BUG=551995
Review URL: https://codereview.chromium.org/1657733002
Cr-Commit-Position: refs/heads/master@{#372748}
4 files changed, 15 insertions, 2 deletions
diff --git a/chrome/browser/memory/tab_manager.h b/chrome/browser/memory/tab_manager.h index 99f3ba5..f3f18314 100644 --- a/chrome/browser/memory/tab_manager.h +++ b/chrome/browser/memory/tab_manager.h @@ -118,6 +118,7 @@ class TabManager : public TabStripModelObserver { FRIEND_TEST_ALL_PREFIXES(TabManagerTest, DiscardedTabKeepsLastActiveTime); FRIEND_TEST_ALL_PREFIXES(TabManagerTest, DiscardWebContentsAt); FRIEND_TEST_ALL_PREFIXES(TabManagerTest, IsInternalPage); + FRIEND_TEST_ALL_PREFIXES(TabManagerTest, OomPressureListener); FRIEND_TEST_ALL_PREFIXES(TabManagerTest, ProtectRecentlyUsedTabs); FRIEND_TEST_ALL_PREFIXES(TabManagerTest, ReloadDiscardedTabContextMenu); FRIEND_TEST_ALL_PREFIXES(TabManagerTest, TabManagerBasics); diff --git a/chrome/browser/memory/tab_manager_browsertest.cc b/chrome/browser/memory/tab_manager_browsertest.cc index 165d4f9..eae4ce5 100644 --- a/chrome/browser/memory/tab_manager_browsertest.cc +++ b/chrome/browser/memory/tab_manager_browsertest.cc @@ -51,6 +51,9 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, TabManagerBasics) { ASSERT_TRUE(tab_manager); EXPECT_FALSE(tab_manager->recent_tab_discard()); + // Disable the protection of recent tabs. + tab_manager->minimum_protection_time_ = base::TimeDelta::FromMinutes(0); + // Get three tabs open. WindowedNotificationObserver load1( content::NOTIFICATION_NAV_ENTRY_COMMITTED, @@ -184,6 +187,9 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, OomPressureListener) { TabManager* tab_manager = g_browser_process->GetTabManager(); ASSERT_TRUE(tab_manager); + // Disable the protection of recent tabs. + tab_manager->minimum_protection_time_ = base::TimeDelta::FromMinutes(0); + // Get three tabs open. content::WindowedNotificationObserver load1( content::NOTIFICATION_NAV_ENTRY_COMMITTED, diff --git a/testing/variations/fieldtrial_testing_config_mac.json b/testing/variations/fieldtrial_testing_config_mac.json index 1b72978..049036f 100644 --- a/testing/variations/fieldtrial_testing_config_mac.json +++ b/testing/variations/fieldtrial_testing_config_mac.json @@ -25,7 +25,10 @@ "enable_features": [ "AutomaticTabDiscarding" ], - "group_name": "Enabled_Once_5" + "group_name": "Enabled_Once_5", + "params": { + "MinimumProtectionTime": "300" + } } ], "CaptivePortalInterstitial": [ diff --git a/testing/variations/fieldtrial_testing_config_win.json b/testing/variations/fieldtrial_testing_config_win.json index 70a4392..0a8d2d9 100644 --- a/testing/variations/fieldtrial_testing_config_win.json +++ b/testing/variations/fieldtrial_testing_config_win.json @@ -30,7 +30,10 @@ "enable_features": [ "AutomaticTabDiscarding" ], - "group_name": "Enabled_Once_5" + "group_name": "Enabled_Once_5", + "params": { + "MinimumProtectionTime": "300" + } } ], "BrowserBlacklist": [ |