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

base/message_loop/message_pump_win.h

Index: base/message_loop/message_pump_win.h
diff --git a/base/message_loop/message_pump_win.h b/base/message_loop/message_pump_win.h
index 9184058a6c00088a620a2217723888f3c8bf22db..535a21320e020e6e29b4994c6ebe3d0d2f5bb110 100644
--- a/base/message_loop/message_pump_win.h
+++ b/base/message_loop/message_pump_win.h
@@ -11,7 +11,6 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump.h"
 #include "base/message_loop/message_pump_dispatcher.h"
 #include "base/message_loop/message_pump_observer.h"
@@ -127,44 +126,12 @@ class BASE_EXPORT MessagePumpWin : public MessagePump {
 //
 class BASE_EXPORT MessagePumpForUI : public MessagePumpWin {
  public:
-  // A MessageFilter implements the common Peek/Translate/Dispatch code to deal
-  // with windows messages.
-  // This abstraction is used to inject TSF message peeking. See
-  // TextServicesMessageFilter.
-  class BASE_EXPORT MessageFilter {
-   public:
-    virtual ~MessageFilter() {}
-    // Implements the functionality exposed by the OS through PeekMessage.
-    virtual BOOL DoPeekMessage(MSG* msg,
-                               HWND window_handle,
-                               UINT msg_filter_min,
-                               UINT msg_filter_max,
-                               UINT remove_msg) {
-      return PeekMessage(msg, window_handle, msg_filter_min, msg_filter_max,
-                         remove_msg);
-    }
-    // Returns true if |message| was consumed by the filter and no extra
-    // processing is required. If this method returns false, it is the
-    // responsibility of the caller to ensure that normal processing takes
-    // place.
-    // The priority to consume messages is the following:
-    // - Native Windows' message filter (CallMsgFilter).
-    // - MessageFilter::ProcessMessage.
-    // - MessagePumpDispatcher.
-    // - TranslateMessage / DispatchMessage.
-    virtual bool ProcessMessage(const MSG& msg) { return false;}
-  };
   // The application-defined code passed to the hook procedure.
   static const int kMessageFilterCode = 0x5001;
 
   MessagePumpForUI();
   virtual ~MessagePumpForUI();
 
-  // Sets a new MessageFilter. MessagePumpForUI takes ownership of
-  // |message_filter|. When SetMessageFilter is called, old MessageFilter is
-  // deleted.
-  void SetMessageFilter(scoped_ptr<MessageFilter> message_filter);
-
   // MessagePump methods:
   virtual void ScheduleWork();
   virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time);
@@ -188,8 +155,6 @@ class BASE_EXPORT MessagePumpForUI : public MessagePumpWin {
 
   // A hidden message-only window.
   HWND message_hwnd_;
-
-  scoped_ptr<MessageFilter> message_filter_;
 };
 
 //-----------------------------------------------------------------------------