chrome/browser/sync/test/integration/two_client_themes_sync_test.cc - Issue 26622003: linux_aura: Turn it on again.

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/sync/test/integration/two_client_themes_sync_test.cc

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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 | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_themes_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc

index a188aa38b6f02eb77e6e9f47864b9edecb076f5f..2c08345b4ac753af760b6771ad6b468c81f5f5a9 100644

--- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc

@@ -57,7 +57,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomTheme) {

// TCM ID - 3599303.

// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.

-#if defined(OS_CHROMEOS)

+// TODO(erg): Fails on linux_aura. See http://crbug.com/304554

+#if defined(OS_CHROMEOS) || defined(OS_LINUX)

IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_NativeTheme) {

#else

IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeTheme) {

@@ -106,7 +107,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DefaultTheme) {

// TCM ID - 7292065.

// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.

-#if defined(OS_CHROMEOS)

+// TODO(erg): Fails on linux_aura. See http://crbug.com/304554

+#if defined(OS_CHROMEOS) || defined(OS_LINUX)

IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_NativeDefaultRace) {

#else

IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeDefaultRace) {