diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 05:30:14 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 05:30:14 +0000 |
| commit | deba0ff3212e9c8a263ade6280cfba4c5a1843d1 (patch) | |
| tree | 252afd483e5d6881bb416fe8ebf6ff6d3236e171 /ipc | |
| parent | 31fae38c6ce11c9b651f95d2626710f85426dbe8 (diff) | |
| download | chromium_src-deba0ff3212e9c8a263ade6280cfba4c5a1843d1.zip chromium_src-deba0ff3212e9c8a263ade6280cfba4c5a1843d1.tar.gz chromium_src-deba0ff3212e9c8a263ade6280cfba4c5a1843d1.tar.bz2 | |
Fixed bug where CHECKs don't fire if min_log_level > FATAL
BUG=61510
TEST=New unittests in base_unittests
Review URL: http://codereview.chromium.org/4262001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_sync_channel_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index ffd2efd..15d5a38 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -808,6 +808,8 @@ TEST_F(IPCSyncChannelTest, QueuedReply) { namespace { +void DropAssert(const std::string&) {} + class BadServer : public Worker { public: explicit BadServer(bool pump_during_send) @@ -822,12 +824,11 @@ class BadServer : public Worker { if (pump_during_send_) msg->EnableMessagePumping(); - // Temporarily set the minimum logging very high so that the assertion - // in ipc_message_utils doesn't fire. - int log_level = logging::GetMinLogLevel(); - logging::SetMinLogLevel(kint32max); + // Temporarily ignore asserts so that the assertion in + // ipc_message_utils doesn't cause termination. + logging::SetLogAssertHandler(&DropAssert); bool result = Send(msg); - logging::SetMinLogLevel(log_level); + logging::SetLogAssertHandler(NULL); DCHECK(!result); // Need to send another message to get the client to call Done(). |