trunk/src/chrome/browser/task_manager/task_manager_util_unittest.cc - Issue 135903002: Revert 244407 "InstantExtended: remove dead code related to the ..."

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: trunk/src/chrome/browser/task_manager/task_manager_util_unittest.cc

Issue 135903002: Revert 244407 "InstantExtended: remove dead code related to the ..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/chrome/browser/task_manager/task_manager_util.cc ('k') | trunk/src/chrome/browser/ui/browser_instant_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/task_manager/task_manager_util_unittest.cc

===================================================================

--- trunk/src/chrome/browser/task_manager/task_manager_util_unittest.cc (revision 244428)

+++ trunk/src/chrome/browser/task_manager/task_manager_util_unittest.cc (working copy)

@@ -18,25 +18,28 @@

bool is_extension;

bool is_incognito;

bool is_prerender;

+ bool is_instant_overlay;

bool is_background;

int expected_result;

};

const Configuration configs[] = {

// Use implicit int->bool conversion to save space and keep alignment.

- {1, 0, 0, 0, 1, IDS_TASK_MANAGER_BACKGROUND_PREFIX},

- {1, 0, 1, 0, 0, IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX},

- {1, 0, 0, 0, 0, IDS_TASK_MANAGER_APP_PREFIX},

- {0, 1, 1, 0, 0, IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX},

- {0, 1, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_PREFIX},

- {0, 0, 0, 1, 0, IDS_TASK_MANAGER_PRERENDER_PREFIX},

- {0, 0, 1, 0, 0, IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX},

- {0, 0, 0, 0, 0, IDS_TASK_MANAGER_TAB_PREFIX}};

+ {1, 0, 0, 0, 0, 1, IDS_TASK_MANAGER_BACKGROUND_PREFIX},

+ {1, 0, 1, 0, 0, 0, IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX},

+ {1, 0, 0, 0, 0, 0, IDS_TASK_MANAGER_APP_PREFIX},

+ {0, 1, 1, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX},

+ {0, 1, 0, 0, 0, 0, IDS_TASK_MANAGER_EXTENSION_PREFIX},

+ {0, 0, 0, 1, 0, 0, IDS_TASK_MANAGER_PRERENDER_PREFIX},

+ {0, 0, 0, 0, 1, 0, IDS_TASK_MANAGER_INSTANT_OVERLAY_PREFIX},

+ {0, 0, 1, 0, 0, 0, IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX},

+ {0, 0, 0, 0, 0, 0, IDS_TASK_MANAGER_TAB_PREFIX}};

for (size_t i = 0; i < ARRAYSIZE_UNSAFE(configs); ++i) {

EXPECT_EQ(configs[i].expected_result,

GetMessagePrefixID(configs[i].is_app,

configs[i].is_extension,

configs[i].is_incognito,

configs[i].is_prerender,

+ configs[i].is_instant_overlay,

configs[i].is_background));

}