diff options
| author | pshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 05:04:36 +0000 |
|---|---|---|
| committer | pshenoy@chromium.org <pshenoy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 05:04:36 +0000 |
| commit | d690157e701ea410a9d6255a4693198d9a363754 (patch) | |
| tree | cc297147e7c483d52609a1724e1fd6ac786fc343 | |
| parent | 9650db67bd9e36710f1487cb1d9b6a1a454b4640 (diff) | |
| download | chromium_src-d690157e701ea410a9d6255a4693198d9a363754.zip chromium_src-d690157e701ea410a9d6255a4693198d9a363754.tar.gz chromium_src-d690157e701ea410a9d6255a4693198d9a363754.tar.bz2 | |
Disable FirstRunMasterPrefsWithTrackedPreferences.TrackedPreferencesSurviveFirstRun on Linux on official builder.
See below issues for details.
http://crbug.com/342427
http://crbug.com/314221
BUG=342427,314221
Review URL: https://codereview.chromium.org/163613003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251526 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/first_run/first_run_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc index 8ef957b..c295df9 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 |