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

Unified Diff: chrome/browser/download/download_manager_unittest.cc

Issue 8677014: Build & run unit tests on Aura (Rebase) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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 | « build/all.gyp ('k') | chrome/browser/printing/print_preview_tab_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_manager_unittest.cc
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index f37c92a59a8662602a0c9965cdc72bf848924e10..5d0ac6a0a4520b558b53c4a3d19ab31b41371063 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -43,6 +43,17 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/text/bytes_formatting.h"
+#if defined(USE_AURA) && defined(OS_WIN)
+// http://crbug.com/105200
+#define MAYBE_StartDownload DISABLED_StartDownload
+#define MAYBE_DownloadOverwriteTest DISABLED_DownloadOverwriteTest
+#define MAYBE_DownloadRemoveTest DISABLED_DownloadRemoveTest
+#else
+#define MAYBE_StartDownload StartDownload
+#define MAYBE_DownloadOverwriteTest DownloadOverwriteTest
+#define MAYBE_DownloadRemoveTest DownloadRemoveTest
+#endif
+
using content::BrowserThread;
DownloadId::Domain kValidIdDomain = "valid DownloadId::Domain";
@@ -348,7 +359,7 @@ class ItemObserver : public DownloadItem::Observer {
} // namespace
-TEST_F(DownloadManagerTest, StartDownload) {
+TEST_F(DownloadManagerTest, MAYBE_StartDownload) {
content::TestBrowserThread io_thread(BrowserThread::IO, &message_loop_);
PrefService* prefs = profile_->GetPrefs();
prefs->SetFilePath(prefs::kDownloadDefaultDirectory, FilePath());
@@ -681,7 +692,7 @@ TEST_F(DownloadManagerTest, DownloadCancelTest) {
EXPECT_FALSE(file_util::PathExists(cr_path));
}
-TEST_F(DownloadManagerTest, DownloadOverwriteTest) {
+TEST_F(DownloadManagerTest, MAYBE_DownloadOverwriteTest) {
using ::testing::_;
using ::testing::CreateFunctor;
using ::testing::Invoke;
@@ -771,7 +782,7 @@ TEST_F(DownloadManagerTest, DownloadOverwriteTest) {
EXPECT_EQ(std::string(kTestData), file_contents);
}
-TEST_F(DownloadManagerTest, DownloadRemoveTest) {
+TEST_F(DownloadManagerTest, MAYBE_DownloadRemoveTest) {
using ::testing::_;
using ::testing::CreateFunctor;
using ::testing::Invoke;
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/printing/print_preview_tab_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698