Backed out changeset ae89c24b7692 (bug 1264820) for -Werror build bustage

MozReview-Commit-ID: ECNuGMefyqC
This commit is contained in:
Daniel Holbert 2016-04-20 15:41:32 -07:00
parent 612b86dc91
commit 2b3d8925f1
2 changed files with 2 additions and 16 deletions

View File

@ -759,7 +759,7 @@ MessageChannel::Send(Message* aMsg)
{
if (aMsg->capacity() >= kMinTelemetryMessageSize) {
Telemetry::Accumulate(Telemetry::IPC_MESSAGE_SIZE,
nsDependentCString(aMsg->name()), aMsg->capacity());
nsCString(aMsg->name()), aMsg->capacity());
}
CxxStackFrame frame(*this, OUT_MESSAGE, aMsg);
@ -1059,7 +1059,7 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
{
if (aMsg->capacity() >= kMinTelemetryMessageSize) {
Telemetry::Accumulate(Telemetry::IPC_MESSAGE_SIZE,
nsDependentCString(aMsg->name()), aMsg->capacity());
nsCString(aMsg->name()), aMsg->capacity());
}
nsAutoPtr<Message> msg(aMsg);
@ -1244,10 +1244,6 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
MOZ_RELEASE_ASSERT(reply->is_sync());
*aReply = Move(*reply);
if (aReply->size() >= kMinTelemetryMessageSize) {
Telemetry::Accumulate(Telemetry::IPC_REPLY_SIZE,
nsDependentCString(aMsg->name()), aReply->capacity());
}
return true;
}

View File

@ -10521,16 +10521,6 @@
"keyed": true,
"description": "Measures the size of IPC messages by message name"
},
"IPC_REPLY_SIZE": {
"alert_emails": ["wmccloskey@mozilla.com"],
"bug_numbers": [1264820],
"expires_in_version": "55",
"kind": "exponential",
"high": 8000000,
"n_buckets": 50,
"keyed": true,
"description": "Measures the size of IPC messages by message name"
},
"MESSAGE_MANAGER_MESSAGE_SIZE": {
"alert_emails": ["wmccloskey@mozilla.com"],
"bug_numbers": [1260908],