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

trunk/src/base/message_loop/message_pump_io_ios.cc

Index: trunk/src/base/message_loop/message_pump_io_ios.cc
===================================================================
--- trunk/src/base/message_loop/message_pump_io_ios.cc	(revision 212951)
+++ trunk/src/base/message_loop/message_pump_io_ios.cc	(working copy)
@@ -11,6 +11,7 @@
       fdref_(NULL),
       callback_types_(0),
       fd_source_(NULL),
+      pump_(NULL),
       watcher_(NULL) {
 }
 
@@ -23,12 +24,11 @@
     return true;
 
   CFFileDescriptorDisableCallBacks(fdref_, callback_types_);
-  if (pump_)
-    pump_->RemoveRunLoopSource(fd_source_);
+  pump_->RemoveRunLoopSource(fd_source_);
   fd_source_.reset();
   fdref_.reset();
   callback_types_ = 0;
-  pump_.reset();
+  pump_ = NULL;
   watcher_ = NULL;
   return true;
 }
@@ -65,7 +65,7 @@
   pump->DidProcessIOEvent();
 }
 
-MessagePumpIOSForIO::MessagePumpIOSForIO() : weak_factory_(this) {
+MessagePumpIOSForIO::MessagePumpIOSForIO() {
 }
 
 MessagePumpIOSForIO::~MessagePumpIOSForIO() {
@@ -143,7 +143,7 @@
   }
 
   controller->set_watcher(delegate);
-  controller->set_pump(weak_factory_.GetWeakPtr());
+  controller->set_pump(this);
 
   return true;
 }
@@ -183,8 +183,7 @@
       fdref, base::scoped_policy::RETAIN);
 
   int fd = CFFileDescriptorGetNativeDescriptor(fdref);
-  MessagePumpIOSForIO* pump = controller->pump().get();
-  DCHECK(pump);
+  MessagePumpIOSForIO* pump = controller->pump();
   if (callback_types & kCFFileDescriptorWriteCallBack)
     controller->OnFileCanWriteWithoutBlocking(fd, pump);