Revert r151669 and r155589 as non-Aura Metro mode is gone

base/message_loop/message_pump_win.cc

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 1927473b1eb46b0fbc9e8bf726b39a907d7a7578..d570130ecd39000eca8af594b193ecd0f299ba58 100644
--- a/base/message_loop/message_pump_win.cc
+++ b/base/message_loop/message_pump_win.cc
@@ -97,8 +97,7 @@ int MessagePumpWin::GetCurrentDelay() const {
 // MessagePumpForUI public:
 
 MessagePumpForUI::MessagePumpForUI()
-    : atom_(0),
-      message_filter_(new MessageFilter) {
+    : atom_(0) {
   InitMessageWnd();
 }
 
@@ -346,7 +345,7 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() {
     sent_messages_in_queue = true;
 
   MSG msg;
-  if (message_filter_->DoPeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+  if (!!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))

[Nico, 2014/02/08 20:10:46]

Do you need the `!!`? Is just `if (PeekMessage(…` enough?

[yukawa, 2014/02/09 08:09:08]

Year, that is not necessary in C but I believe it is preferable
in general in C++.
Caveat: PeekMessage Win32 API returns a BOOL value, which is
actually a typedef of int.
http://msdn.microsoft.com/en-us/library/windows/desktop/ms644943.aspx
At the very least, we don't need to suppress C4800 warning
if we put `!!` there.
http://msdn.microsoft.com/en-us/library/b6801kcy.aspx

It seems that `!!` is not inconsistent in Chromium, even when
compared with ` == FALSE` style
http://goo.gl/9lZaTs
http://goo.gl/LyRazJ
(Disclaimer: The former results contains shorthand of ` == NULL`)

Anyway, I'm fine to use any style as long as owners prefer it.
Let me know if you have some requests.

[Nico, 2014/02/09 20:36:09]

I think we build with C4800 enabled. I think `!= 0` reads better than `!!`, but
it's up to you.

[yukawa, 2014/02/10 06:50:46]

OK. Switched to ` != FALSE`.

     return ProcessMessageHelper(msg);
 
   return sent_messages_in_queue;
@@ -372,14 +371,12 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
 
   WillProcessMessage(msg);
 
-  if (!message_filter_->ProcessMessage(msg)) {
-    if (state_->dispatcher) {
-      if (!state_->dispatcher->Dispatch(msg))
-        state_->should_quit = true;
-    } else {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
+  if (state_->dispatcher) {
+    if (!state_->dispatcher->Dispatch(msg))
+      state_->should_quit = true;
+  } else {
+    TranslateMessage(&msg);
+    DispatchMessage(&msg);
   }
 
   DidProcessMessage(msg);
@@ -406,8 +403,7 @@ bool MessagePumpForUI::ProcessPumpReplacementMessage() {
     have_message = PeekMessage(&msg, NULL, WM_PAINT, WM_PAINT, PM_REMOVE) ||
                    PeekMessage(&msg, NULL, WM_TIMER, WM_TIMER, PM_REMOVE);
   } else {
-    have_message = !!message_filter_->DoPeekMessage(&msg, NULL, 0, 0,
-                                                    PM_REMOVE);
+    have_message = !!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE);
   }
 
   DCHECK(!have_message || kMsgHaveWork != msg.message ||
@@ -429,11 +425,6 @@ bool MessagePumpForUI::ProcessPumpReplacementMessage() {
   return ProcessMessageHelper(msg);
 }
 
-void MessagePumpForUI::SetMessageFilter(
-    scoped_ptr<MessageFilter> message_filter) {
-  message_filter_ = message_filter.Pass();
-}
-
 //-----------------------------------------------------------------------------
 // MessagePumpForIO public: