chrome/browser/first_run/first_run_browsertest.cc - Issue 922413003: Disabling FirstRunMasterPrefsImportDefault.ImportDefault on Mac

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/first_run/first_run_browsertest.cc

Issue 922413003: Disabling FirstRunMasterPrefsImportDefault.ImportDefault on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removing parens Created 5 years, 10 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

Index: chrome/browser/first_run/first_run_browsertest.cc

diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc

index 09ad85193fb41828a9ae3ce86e5820b3d488004c..cff7aee2c4bca8c7a6f3ddb3d503d57a08425c1d 100644

--- a/chrome/browser/first_run/first_run_browsertest.cc

+++ b/chrome/browser/first_run/first_run_browsertest.cc

@@ -168,7 +168,7 @@ extern const char kImportDefault[] =

typedef FirstRunMasterPrefsBrowserTestT<kImportDefault>

FirstRunMasterPrefsImportDefault;

// http://crbug.com/314221

-#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))

+#if defined(OS_MACOSX) || (defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX))

#define MAYBE_ImportDefault DISABLED_ImportDefault

#else

#define MAYBE_ImportDefault ImportDefault

« no previous file with comments | « no previous file | no next file » | no next file with comments »