Mutual exclusion between gconf and the glib main loop.

base/message_pump_glib.h

Index: base/message_pump_glib.h
===================================================================
--- base/message_pump_glib.h	(revision 14449)
+++ base/message_pump_glib.h	(working copy)
@@ -7,6 +7,7 @@
 
 #include <glib.h>
 
+#include "base/lock.h"
 #include "base/message_pump.h"
 #include "base/time.h"
 
@@ -16,6 +17,10 @@
 // OS_LINUX platforms using GLib.
 class MessagePumpForUI : public MessagePump {
  public:
+  // A lock for mutual exclusion with the glib main loop, used for
+  // gconf in ProxyConfigServiceLinux.
+  static Lock glib_main_loop_lock_;
+
   MessagePumpForUI();
   ~MessagePumpForUI();