diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 04:43:54 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 04:43:54 +0000 |
| commit | 4d0f93ca8cec419891f009d476f1525ccab56e54 (patch) | |
| tree | e1d948f4ef60216d351aef78aa259ba6ba8767e3 /base/synchronization | |
| parent | 86e99b8b7da2a57d0cd8f238d7801a12dcdaee58 (diff) | |
| download | chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.zip chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.tar.gz chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.tar.bz2 | |
Upstream ProcessUtilTest, and make a few other files compile on Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8059007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/synchronization')
| -rw-r--r-- | base/synchronization/cancellation_flag_unittest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/synchronization/cancellation_flag_unittest.cc b/base/synchronization/cancellation_flag_unittest.cc index c405c79..e4b5830 100644 --- a/base/synchronization/cancellation_flag_unittest.cc +++ b/base/synchronization/cancellation_flag_unittest.cc @@ -26,7 +26,9 @@ class CancelTask : public Task { public: explicit CancelTask(CancellationFlag* flag) : flag_(flag) {} virtual void Run() { +#if GTEST_HAS_DEATH_TEST ASSERT_DEBUG_DEATH(flag_->Set(), ""); +#endif } private: CancellationFlag* flag_; |