chrome/browser/themes/browser_theme_pack_unittest.cc - Issue 292443002: linux_aura: Compile ash into chrome.

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/themes/browser_theme_pack_unittest.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase to ToT Created 6 years, 7 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/themes/browser_theme_pack_unittest.cc

diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc

index 18e3dc71c3c478aac53553ba2afa3878a479bc7c..6db628cdf74875eee9f68c019a63dab2f8e0e93c 100644

--- a/chrome/browser/themes/browser_theme_pack_unittest.cc

+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc

@@ -469,9 +469,9 @@ TEST_F(BrowserThemePackTest, CanParsePaths) {

ParseImageNamesJSON(path_json, &out_file_paths);

size_t expected_file_paths = 2u;

-#if defined(OS_WIN)

- // On Windows additional theme paths are generated to map to the special

- // resource ids like IDR_THEME_FRAME_WIN, etc

+#if defined(USE_ASH) && !defined(OS_CHROMEOS)

+ // On desktop builds with ash, additional theme paths are generated to map to

+ // the special resource ids like IDR_THEME_FRAME_DESKTOP, etc

expected_file_paths = 3u;

#endif

EXPECT_EQ(expected_file_paths, out_file_paths.size());