diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 14:26:17 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 14:26:17 +0000 |
| commit | faf2ee4705a9e0c154d57cb7daeb0157431d8103 (patch) | |
| tree | c3a07afd9123b7b3a02c07fd7980a3c1f26eba78 /chrome/browser/history | |
| parent | 7ae23f67eeb37ef742722f609359d35832d535e0 (diff) | |
| download | chromium_src-faf2ee4705a9e0c154d57cb7daeb0157431d8103.zip chromium_src-faf2ee4705a9e0c154d57cb7daeb0157431d8103.tar.gz chromium_src-faf2ee4705a9e0c154d57cb7daeb0157431d8103.tar.bz2 | |
Revert r46909: "Reland r46681: Use IPC to wait for download in DownloadTest."
TBR=bauerb
TEST=ui_tests on 10.6 and ChromiumOS should go green.
BUG=43066
Review URL: http://codereview.chromium.org/1985014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/multipart_uitest.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/history/multipart_uitest.cc b/chrome/browser/history/multipart_uitest.cc index 9a50fe3c..7f8688f 100644 --- a/chrome/browser/history/multipart_uitest.cc +++ b/chrome/browser/history/multipart_uitest.cc @@ -15,16 +15,11 @@ namespace { class MultipartResponseUITest : public UITest { }; +#if defined(NDEBUG) // http://code.google.com/p/chromium/issues/detail?id=37746 // Running this test only for release builds as it fails in debug test // runs -#if defined(NDEBUG) -#define MAYBE_SingleVisit SingleVisit -#else -#define MAYBE_SingleVisit DISABLED_SingleVisit -#endif - -TEST_F(MultipartResponseUITest, MAYBE_SingleVisit) { +TEST_F(MultipartResponseUITest, SingleVisit) { // Make sure that visiting a multipart/x-mixed-replace site only // creates one entry in the visits table. const wchar_t kDocRoot[] = L"chrome/test/data"; @@ -61,5 +56,6 @@ TEST_F(MultipartResponseUITest, MAYBE_SingleVisit) { } db.Close(); } +#endif } // namespace |