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

Unified Diff: base/message_pump_io_ios_unittest.cc

Issue 11431003: roll gtest 621:629 and gmock 405:410 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 8 years 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 | « DEPS ('k') | testing/gtest.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_pump_io_ios_unittest.cc
diff --git a/base/message_pump_io_ios_unittest.cc b/base/message_pump_io_ios_unittest.cc
index ddf740f24693e52b6925e72431653fba16303a2f..7a00d119de428d3d0c324efdda359e90e6914ada 100644
--- a/base/message_pump_io_ios_unittest.cc
+++ b/base/message_pump_io_ios_unittest.cc
@@ -79,7 +79,7 @@ TEST_F(MessagePumpIOSForIOTest, TestWatchingFromBadThread) {
MessagePumpIOSForIO::FileDescriptorWatcher watcher;
StupidWatcher delegate;
- ASSERT_DEBUG(io_loop()->WatchFileDescriptor(
+ ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor(
STDOUT_FILENO, false, MessageLoopForIO::WATCH_READ, &watcher, &delegate),
"Check failed: "
"watch_file_descriptor_caller_checker_.CalledOnValidThread()");
« no previous file with comments | « DEPS ('k') | testing/gtest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698