| 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 8ef957bbfdd757fa29dece036d947be298a13eed..c295df9b0fa16ddc4517c7bfc13bc7cdb0f50ff6 100644
|
| --- a/chrome/browser/first_run/first_run_browsertest.cc
|
| +++ b/chrome/browser/first_run/first_run_browsertest.cc
|
| @@ -165,7 +165,7 @@ extern const char kImportDefault[] =
|
| typedef FirstRunMasterPrefsBrowserTestT<kImportDefault>
|
| FirstRunMasterPrefsImportDefault;
|
| // http://crbug.com/314221
|
| -#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
|
| +#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
|
| #define MAYBE_ImportDefault DISABLED_ImportDefault
|
| #else
|
| #define MAYBE_ImportDefault ImportDefault
|
| @@ -188,7 +188,7 @@ extern const char kImportBookmarksFile[] =
|
| typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile>
|
| FirstRunMasterPrefsImportBookmarksFile;
|
| // http://crbug.com/314221
|
| -#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
|
| +#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
|
| #define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile
|
| #else
|
| #define MAYBE_ImportBookmarksFile ImportBookmarksFile
|
| @@ -218,7 +218,7 @@ extern const char kImportNothing[] =
|
| typedef FirstRunMasterPrefsBrowserTestT<kImportNothing>
|
| FirstRunMasterPrefsImportNothing;
|
| // http://crbug.com/314221
|
| -#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
|
| +#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
|
| #define MAYBE_ImportNothingAndShowNewTabPage \
|
| DISABLED_ImportNothingAndShowNewTabPage
|
| #else
|
| @@ -257,7 +257,7 @@ class FirstRunMasterPrefsWithTrackedPreferences
|
| };
|
|
|
| // http://crbug.com/314221
|
| -#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
|
| +#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
|
| #define MAYBE_TrackedPreferencesSurviveFirstRun \
|
| DISABLED_TrackedPreferencesSurviveFirstRun
|
| #else
|
|
|