summaryrefslogtreecommitdiffstats
path: root/base/message_loop.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-10-22 16:58:38 +0100
committerKristian Monsen <kristianm@google.com>2010-10-25 14:24:50 +0100
commit58d02015f8788a79b322c58d4bdbc914e4c333dc (patch)
treedc5314263755b6ff95155e2678daa939b97fe066 /base/message_loop.h
parent7f92e4ca7bcb209f5d9b38cacaf3a1c6cbe493aa (diff)
downloadexternal_chromium-58d02015f8788a79b322c58d4bdbc914e4c333dc.zip
external_chromium-58d02015f8788a79b322c58d4bdbc914e4c333dc.tar.gz
external_chromium-58d02015f8788a79b322c58d4bdbc914e4c333dc.tar.bz2
Syncing external/chroimum with chromium release 61029, base part 2
Removing old hacks that can be removed. file_util_linux.cc was out of sync, there were no local changes so just took the chromium version Bug: 3123385 Change-Id: Ia73d28cdad39158e4703aaa991764189e9e13439
Diffstat (limited to 'base/message_loop.h')
-rw-r--r--base/message_loop.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop.h b/base/message_loop.h
index 2b7c7c8..363c5d0 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -496,7 +496,7 @@ class MessageLoopForUI : public MessageLoop {
// Returns the MessageLoopForUI of the current thread.
static MessageLoopForUI* current() {
MessageLoop* loop = MessageLoop::current();
- //DCHECK_EQ(MessageLoop::TYPE_UI, loop->type());
+ DCHECK_EQ(MessageLoop::TYPE_UI, loop->type());
return static_cast<MessageLoopForUI*>(loop);
}
@@ -558,7 +558,7 @@ class MessageLoopForIO : public MessageLoop {
// Returns the MessageLoopForIO of the current thread.
static MessageLoopForIO* current() {
MessageLoop* loop = MessageLoop::current();
- //DCHECK_EQ(MessageLoop::TYPE_IO, loop->type());
+ DCHECK_EQ(MessageLoop::TYPE_IO, loop->type());
return static_cast<MessageLoopForIO*>(loop);
}