Move message_pump to base/message_loop.

base/message_loop/message_pump_glib.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_pump_glib.h"
+#include "base/message_loop/message_pump_glib.h"
 
 #include <fcntl.h>
 #include <math.h>
 
 #include <glib.h>
 
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/threading/platform_thread.h"
 
+namespace base {
+
 namespace {
 
 // Return a timeout suitable for the glib loop, -1 to block forever,
 // 0 to return right away, or a timeout in milliseconds from now.
-int GetTimeIntervalMilliseconds(const base::TimeTicks& from) {
+int GetTimeIntervalMilliseconds(const TimeTicks& from) {
   if (from.is_null())
     return -1;
 
   // Be careful here.  TimeDelta has a precision of microseconds, but we want a
   // value in milliseconds.  If there are 5.5ms left, should the delay be 5 or
   // 6?  It should be 6 to avoid executing delayed work too early.
   int delay = static_cast<int>(
-      ceil((from - base::TimeTicks::Now()).InMillisecondsF()));
+      ceil((from - TimeTicks::Now()).InMillisecondsF()));
 
   // If this value is negative, then we need to run delayed work soon.
   return delay < 0 ? 0 : delay;
 }
 
 // A brief refresher on GLib:
 //     GLib sources have four callbacks: Prepare, Check, Dispatch and Finalize.
 // On each iteration of the GLib pump, it calls each source's Prepare function.
 // This function should return TRUE if it wants GLib to call its Dispatch, and
 // FALSE otherwise.  It can also set a timeout in this case for the next time
@@ skipping 35 matching lines @@
 // after, from gtk_main_iteration.
 //
 // For the GLib pump we try to follow the Windows UI pump model:
 // - Whenever we receive a wakeup event or the timer for delayed work expires,
 // we run DoWork and/or DoDelayedWork. That part will also run in the other
 // event pumps.
 // - We also run DoWork, DoDelayedWork, and possibly DoIdleWork in the main
 // loop, around event handling.
 
 struct WorkSource : public GSource {
-  base::MessagePumpGlib* pump;
+  MessagePumpGlib* pump;
 };
 
 gboolean WorkSourcePrepare(GSource* source,
                            gint* timeout_ms) {
   *timeout_ms = static_cast<WorkSource*>(source)->pump->HandlePrepare();
   // We always return FALSE, so that our timeout is honored.  If we were
   // to return TRUE, the timeout would be considered to be 0 and the poll
   // would never block.  Once the poll is finished, Check will be called.
   return FALSE;
 }
@@ skipping 15 matching lines @@
 // I wish these could be const, but g_source_new wants non-const.
 GSourceFuncs WorkSourceFuncs = {
   WorkSourcePrepare,
   WorkSourceCheck,
   WorkSourceDispatch,
   NULL
 };
 
 }  // namespace
 
-
-namespace base {
-
 struct MessagePumpGlib::RunState {
   Delegate* delegate;
   MessagePumpDispatcher* dispatcher;
 
   // Used to flag that the current Run() invocation should return ASAP.
   bool should_quit;
 
   // Used to count how many Run() invocations are on the stack.
   int run_depth;
 
@@ skipping 26 matching lines @@
   // This is needed to allow Run calls inside Dispatch.
   g_source_set_can_recurse(work_source_, TRUE);
   g_source_attach(work_source_, context_);
 }
 
 void MessagePumpGlib::RunWithDispatcher(Delegate* delegate,
                                         MessagePumpDispatcher* dispatcher) {
 #ifndef NDEBUG
   // Make sure we only run this on one thread. X/GTK only has one message pump
   // so we can only have one UI loop per process.
-  static base::PlatformThreadId thread_id = base::PlatformThread::CurrentId();
-  DCHECK(thread_id == base::PlatformThread::CurrentId()) <<
+  static PlatformThreadId thread_id = PlatformThread::CurrentId();
+  DCHECK(thread_id == PlatformThread::CurrentId()) <<
       "Running MessagePumpGlib on two different threads; "
       "this is unsupported by GLib!";
 #endif
 
   RunState state;
   state.delegate = delegate;
   state.dispatcher = dispatcher;
   state.should_quit = false;
   state.run_depth = state_ ? state_->run_depth + 1 : 1;
   state.has_work = false;
@@ skipping 145 matching lines @@
   g_source_unref(work_source_);
   close(wakeup_pipe_read_);
   close(wakeup_pipe_write_);
 }
 
 MessagePumpDispatcher* MessagePumpGlib::GetDispatcher() {
   return state_ ? state_->dispatcher : NULL;
 }
 
 }  // namespace base