chrome/browser/chromeos/oom_priority_manager_browsertest.cc - Issue 10937028: Do not discard selected tab

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/oom_priority_manager_browsertest.cc

Issue 10937028: Do not discard selected tab (Closed) Base URL: http://git.chromium.org/chromium/src.git@new

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chromeos/oom_priority_manager_browsertest.cc

diff --git a/chrome/browser/chromeos/oom_priority_manager_browsertest.cc b/chrome/browser/chromeos/oom_priority_manager_browsertest.cc

index 93a776f4e3064ebef7009f38be913657a0f800f4..de5edf611ca0f112dcc5186206c7abcc22ec92df 100644

--- a/chrome/browser/chromeos/oom_priority_manager_browsertest.cc

+++ b/chrome/browser/chromeos/oom_priority_manager_browsertest.cc

@@ -92,14 +92,18 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {

EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));

EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));

- // Kill the third tab

+ // Kill the third tab. This tab is not marked becuase it will be reloaded.

EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab());

EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(0));

EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));

- EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(2));

+ EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));

+ EXPECT_EQ(2, browser()->active_index());

- // Running when all tabs are discarded should do nothing.

- EXPECT_FALSE(g_browser_process->oom_priority_manager()->DiscardTab());

+ // Kill the third tab again, make sure last tab can be killed and be reloaded

+ // again.

+ EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab());

+ EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));

+ EXPECT_EQ(2, browser()->active_index());

// Force creation of the FindBarController.

browser()->GetFindBarController();

@@ -116,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) {

EXPECT_EQ(0, browser()->active_index());

EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(0));

EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1));

- EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(2));

+ EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2));

// Select the third tab. It should reload.

WindowedNotificationObserver reload2(