Index: base/message_loop/message_pump_win.cc |
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc |
index 3e480952fc696b1120a7aea2b28f769dc62ecbd9..08f00f55eaae794ec19e6c022bed6669911ad8b3 100644 |
--- a/base/message_loop/message_pump_win.cc |
+++ b/base/message_loop/message_pump_win.cc |
@@ -321,9 +321,9 @@ |
bool MessagePumpForUI::ProcessNextWindowsMessage() { |
// TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
- tracked_objects::ScopedTracker tracking_profile1( |
+ tracked_objects::ScopedTracker tracking_profile( |
FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "440919 MessagePumpForUI::ProcessNextWindowsMessage1")); |
+ "440919 <<MessagePumpForUI::ProcessNextWindowsMessage>>")); |
// If there are sent messages in the queue then PeekMessage internally |
// dispatches the message and returns false. We return true in this |
@@ -334,11 +334,6 @@ |
if (HIWORD(queue_status) & QS_SENDMESSAGE) |
sent_messages_in_queue = true; |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
- tracked_objects::ScopedTracker tracking_profile2( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "440919 MessagePumpForUI::ProcessNextWindowsMessage2")); |
- |
MSG msg; |
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) != FALSE) |
return ProcessMessageHelper(msg); |
@@ -348,9 +343,9 @@ |
bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) { |
// TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
- tracked_objects::ScopedTracker tracking_profile1( |
+ tracked_objects::ScopedTracker tracking_profile( |
FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "440919 MessagePumpForUI::ProcessMessageHelper1")); |
+ "440919 MessagePumpForUI::ProcessMessageHelper")); |
TRACE_EVENT1("base", "MessagePumpForUI::ProcessMessageHelper", |
"message", msg.message); |
@@ -366,18 +361,8 @@ |
if (msg.message == kMsgHaveWork && msg.hwnd == message_hwnd_) |
return ProcessPumpReplacementMessage(); |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
- tracked_objects::ScopedTracker tracking_profile2( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "440919 MessagePumpForUI::ProcessMessageHelper2")); |
- |
if (CallMsgFilter(const_cast<MSG*>(&msg), kMessageFilterCode)) |
return true; |
- |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
- tracked_objects::ScopedTracker tracking_profile3( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "440919 MessagePumpForUI::ProcessMessageHelper3")); |
uint32_t action = MessagePumpDispatcher::POST_DISPATCH_PERFORM_DEFAULT; |
if (state_->dispatcher) |
@@ -393,11 +378,6 @@ |
} |
bool MessagePumpForUI::ProcessPumpReplacementMessage() { |
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
- tracked_objects::ScopedTracker tracking_profile( |
- FROM_HERE_WITH_EXPLICIT_FUNCTION( |
- "440919 MessagePumpForUI::ProcessPumpReplacementMessage")); |
- |
// When we encounter a kMsgHaveWork message, this method is called to peek |
// and process a replacement message, such as a WM_PAINT or WM_TIMER. The |
// goal is to make the kMsgHaveWork as non-intrusive as possible, even though |