From c957f41811ad9b86656e804d6f4728349bdcf11d Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Mon, 3 Dec 2012 21:28:14 +0000 Subject: roll gtest 621:629 and gmock 405:410 gtest: 622: Fixes gtest-tuple.h in Visual C++ 7.1. 623: Removes obsolete debug code. 624: wiki change 625: Improves Android support (by David Turner). 626: wiki change 627: wiki change 628: combines 8 changes: * Fixes some python shebang lines. * Add ElementsAreArray overloads to gmock. * Templatize MatchAndExplain to allow independent string types. * Fix bug where the constructor of the return type of ElementsAre() saves a reference instead of a copy of the arguments. * Extends ElementsAre() to accept arrays whose sizes aren't known. * Switches gTest's internal FilePath class to std::string * Switches gTest & gMock from using testing::internal::String objects to std::string. 629: Unbreak building gtest with -std=c++11 on Mac OS X 10.6. gmock: 406: wiki change 407: Pulls in gtest r615 (Renames internal enums to the kFoo naming style.) 408: Makes gmock's Pointee() work for optional (by Jeffrey Yasskin). 409: wiki change 410: Same commit message as gtest 628. BUG=none Review URL: https://codereview.chromium.org/11431003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170815 0039d316-1c4b-4281-b951-d872f2087c98 --- base/message_pump_io_ios_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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 ddf740f..7a00d11 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()"); -- cgit v1.1