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

trunk/src/base/message_loop/message_pump_glib.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_GLIB_H_
 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_GLIB_H_
 
 #include "base/base_export.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump.h"
@@ skipping 17 matching lines @@
 // passed to Dispatcher's Dispatch method for dispatch. It is up to the
 // Dispatcher to dispatch, or not, the event. The platform specific
 // implementation of the class is in message_pump_gtk/message_pump_x.
 class MessagePumpDispatcher;
 
 // This class implements a base MessagePump needed for TYPE_UI MessageLoops on
 // platforms using GLib.
 class BASE_EXPORT MessagePumpGlib : public MessagePump {
  public:
   MessagePumpGlib();
-  virtual ~MessagePumpGlib();
 
   // Like MessagePump::Run, but events are routed through dispatcher.
   virtual void RunWithDispatcher(Delegate* delegate,
                                  MessagePumpDispatcher* dispatcher);
 
   // Internal methods used for processing the pump callbacks.  They are
   // public for simplicity but should not be used directly.  HandlePrepare
   // is called during the prepare step of glib, and returns a timeout that
   // will be passed to the poll. HandleCheck is called after the poll
   // has completed, and returns whether or not HandleDispatch should be called.
   // HandleDispatch is called if HandleCheck returned true.
   int HandlePrepare();
   bool HandleCheck();
   void HandleDispatch();
 
   // Adds an Observer, which will start receiving notifications immediately.
   void AddObserver(MessagePumpObserver* observer);
 
   // Removes an Observer.  It is safe to call this method while an Observer is
   // receiving a notification callback.
   void RemoveObserver(MessagePumpObserver* observer);
 
   // Overridden from MessagePump:
   virtual void Run(Delegate* delegate) OVERRIDE;
   virtual void Quit() OVERRIDE;
   virtual void ScheduleWork() OVERRIDE;
   virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time) OVERRIDE;
 
  protected:
+  virtual ~MessagePumpGlib();
+
   // Returns the dispatcher for the current run state (|state_->dispatcher|).
   MessagePumpDispatcher* GetDispatcher();
 
   ObserverList<MessagePumpObserver>& observers() { return observers_; }
 
  private:
   // We may make recursive calls to Run, so we save state that needs to be
   // separate between them in this structure type.
   struct RunState;
 
@@ skipping 22 matching lines @@
 
   // List of observers.
   ObserverList<MessagePumpObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpGlib);
 };
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_GLIB_H_