As an intermediary step towards having a message pump handling IO through com...

base/message_loop.cc

 // Copyright (c) 2006-2008 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.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
@@ skipping 60 matching lines @@
 
 MessageLoop::MessageLoop(Type type)
     : type_(type),
       nestable_tasks_allowed_(true),
       exception_restoration_(false),
       state_(NULL),
       next_sequence_num_(0) {
   DCHECK(!current()) << "should only have one message loop per thread";
   lazy_tls_ptr.Pointer()->Set(this);
 
-  // TODO(darin): Choose the pump based on the requested type.
 #if defined(OS_WIN)
+  // TODO(rvargas): Get rid of the OS guards.
   if (type_ == TYPE_DEFAULT) {
     pump_ = new base::MessagePumpDefault();
+  } else if (type_ == TYPE_IO) {
+    pump_ = new base::MessagePumpForIO();
   } else {
-    pump_ = new base::MessagePumpWin();
+    DCHECK(type_ == TYPE_UI);
+    pump_ = new base::MessagePumpForUI();
   }
 #elif defined(OS_POSIX)
 #if defined(OS_MACOSX)
   if (type_ == TYPE_UI) {
     pump_ = base::MessagePumpMac::Create();
   } else
 #endif  // OS_MACOSX
   if (type_ == TYPE_IO) {
     pump_ = new base::MessagePumpLibevent();
   } else {
@@ skipping 472 matching lines @@
 }
 
 #endif  // defined(OS_WIN)
 
 //------------------------------------------------------------------------------
 // MessageLoopForIO
 
 #if defined(OS_WIN)
 
 void MessageLoopForIO::WatchObject(HANDLE object, Watcher* watcher) {
-  pump_win()->WatchObject(object, watcher);
+  pump_io()->WatchObject(object, watcher);
 }
 
 #elif defined(OS_POSIX)
 
 void MessageLoopForIO::WatchSocket(int socket, short interest_mask, 
                                    struct event* e, Watcher* watcher) {
   pump_libevent()->WatchSocket(socket, interest_mask, e, watcher);
 }
 
 void MessageLoopForIO::UnwatchSocket(struct event* e) {
   pump_libevent()->UnwatchSocket(e);
 }
 #endif