Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1234)

Unified Diff: chrome/browser/first_run/first_run_browsertest.cc

Issue 163613003: Disable FirstRunMasterPrefsWithTrackedPreferences.TrackedPreferencesSurviveFirstRun on Linux on off… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698