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

trunk/src/base/message_loop/message_pump_gtk.cc

 // 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.
 
 #include "base/message_loop/message_pump_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include "base/debug/trace_event.h"
@@ skipping 47 matching lines @@
       return "Unknown Gdk Event";
   }
 }
 
 }  // namespace
 
 MessagePumpGtk::MessagePumpGtk() : MessagePumpGlib() {
   gdk_event_handler_set(&EventDispatcher, this, NULL);
 }
 
-MessagePumpGtk::~MessagePumpGtk() {
-  gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event),
-                        this, NULL);
-}
-
 void MessagePumpGtk::DispatchEvents(GdkEvent* event) {
   UNSHIPPED_TRACE_EVENT1("task", "MessagePumpGtk::DispatchEvents",
                          "type", EventToTypeString(event));
 
   WillProcessEvent(event);
 
   MessagePumpDispatcher* dispatcher = GetDispatcher();
   if (!dispatcher)
     gtk_main_do_event(event);
   else if (!dispatcher->Dispatch(event))
     Quit();
 
   DidProcessEvent(event);
 }
 
 // static
 Display* MessagePumpGtk::GetDefaultXDisplay() {
   static GdkDisplay* display = gdk_display_get_default();
   if (!display) {
     // GTK / GDK has not been initialized, which is a decision we wish to
     // support, for example for the GPU process.
     static Display* xdisplay = XOpenDisplay(NULL);
     return xdisplay;
   }
   return GDK_DISPLAY_XDISPLAY(display);
 }
 
+MessagePumpGtk::~MessagePumpGtk() {
+  gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event),
+                        this, NULL);
+}
+
 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event));
 }
 
 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event));
 }
 
 // static
 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) {
   MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data);
   message_pump->DispatchEvents(event);
 }
 
 }  // namespace base