Revert 212948 "Made MessagePump a non-thread safe class."

trunk/src/base/message_loop/message_pump_aurax11.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H
 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H
 
 #include <bitset>
 #include <map>
 
@@ skipping 17 matching lines @@
 
 // This class implements a message-pump for dispatching X events.
 //
 // If there's a current dispatcher given through RunWithDispatcher(), that
 // dispatcher receives events. Otherwise, we route to messages to dispatchers
 // who have subscribed to messages from a specific X11 window.
 class BASE_EXPORT MessagePumpAuraX11 : public MessagePumpGlib,
                                        public MessagePumpDispatcher {
  public:
   MessagePumpAuraX11();
-  virtual ~MessagePumpAuraX11();
 
   // Returns default X Display.
   static Display* GetDefaultXDisplay();
 
   // Returns true if the system supports XINPUT2.
   static bool HasXInput2();
 
   // Returns the UI message pump.
   static MessagePumpAuraX11* Current();
 
@@ skipping 17 matching lines @@
   // xserver that |w| has been mapped; StructureNotifyMask events on |w| are
   // pulled out from the queue and dispatched out of order.
   //
   // For those that know X11, this is really a wrapper around XWindowEvent
   // which still makes sure the preempted event is dispatched instead of
   // dropped on the floor. This method exists because mapping a window is
   // asynchronous (and we receive an XEvent when mapped), while there are also
   // functions which require a mapped window.
   void BlockUntilWindowMapped(unsigned long xid);
 
+ protected:
+  virtual ~MessagePumpAuraX11();
+
  private:
   typedef std::map<unsigned long, MessagePumpDispatcher*> DispatchersMap;
 
   // Initializes the glib event source for X.
   void InitXSource();
 
   // Dispatches the XEvent and returns true if we should exit the current loop
   // of message processing.
   bool ProcessXEvent(MessagePumpDispatcher* dispatcher, XEvent* event);
 
@@ skipping 25 matching lines @@
   unsigned long x_root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpAuraX11);
 };
 
 typedef MessagePumpAuraX11 MessagePumpForUI;
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H