diff options
| author | benjhayden@chromium.org <benjhayden@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 19:12:04 +0000 |
|---|---|---|
| committer | benjhayden@chromium.org <benjhayden@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 19:12:04 +0000 |
| commit | cc7bf5f6e807fce62885eaf0c10a460606f7f2da (patch) | |
| tree | 369b363ef988523b4d464fe1cff5791aa695e33c | |
| parent | e94f211c295157021945eb5ae1d61e10b6926fa3 (diff) | |
| download | chromium_src-cc7bf5f6e807fce62885eaf0c10a460606f7f2da.zip chromium_src-cc7bf5f6e807fce62885eaf0c10a460606f7f2da.tar.gz chromium_src-cc7bf5f6e807fce62885eaf0c10a460606f7f2da.tar.bz2 | |
Disable DownloadTest_History on chromeos
TBR=asanka
Review URL: https://codereview.chromium.org/12907005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188610 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/download/download_browsertest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 325130e..35354a4 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -1807,7 +1807,12 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PRE_DownloadTest_History) { observer.WaitForStored(); } -IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_History) { +#if defined(OS_CHROMEOS) +#define MAYBE_DownloadTest_History DISABLED_DownloadTest_History +#else +#define MAYBE_DownloadTest_History DownloadTest_History +#endif +IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_History) { // This starts up right after PRE_DownloadTest_History and shares the same // profile directory. base::FilePath file(FILE_PATH_LITERAL("download-test1.lib")); |