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

Unified Diff: base/process_util_unittest.cc

Issue 8781: Fix compilation error on Windows (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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: base/process_util_unittest.cc
===================================================================
--- base/process_util_unittest.cc (revision 4315)
+++ base/process_util_unittest.cc (working copy)
@@ -44,18 +44,14 @@
}
#if defined(OS_WIN)
-#define EXE_SUFFIX ".exe"
+#define EXE_SUFFIX L".exe"
#else
-#define EXE_SUFFIX ""
+#define EXE_SUFFIX L""
#endif
// TODO(port): finish port on Mac
-#if defined(OS_MACOSX)
-TEST_F(ProcessUtilTest, DISABLED_KillSlowChild)
-#else
-TEST_F(ProcessUtilTest, KillSlowChild)
-#endif
-{
+#if !defined(OS_MACOSX)
+TEST_F(ProcessUtilTest, KillSlowChild) {
remove("SlowChildProcess.die");
int oldcount = process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0);
@@ -69,6 +65,7 @@
PlatformThread::Sleep(1000);
EXPECT_EQ(oldcount, process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0));
}
+#endif
// TODO(estade): if possible, port these 2 tests.
#if defined(OS_WIN)
« 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