Add base::RunLoop and update ui_test_utils to use it to reduce flakiness

base/message_loop.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.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 285 matching lines @@
 }
 
 void MessageLoop::PostNonNestableDelayedTask(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay) {
   PostNonNestableDelayedTask(from_here, task, delay.InMillisecondsRoundedUp());
 }
 
 void MessageLoop::Run() {
-  AutoRunState save_state(this);
+  AutoRunState save_state(this, NULL);
+  RunHandler();
+}
+
+void MessageLoop::RunWithID(const RunID& run_id) {
+  AutoRunState save_state(this, run_id);
+  if (run_id->quit_now_received_)
+    return;
   RunHandler();
 }
 
 void MessageLoop::RunAllPending() {
-  AutoRunState save_state(this);
-  state_->quit_received = true;  // Means run until we would otherwise block.
+  AutoRunState save_state(this, NULL);
+  state_->quit_received_ = true;  // Means run until we would otherwise block.
   RunHandler();
 }
 
-void MessageLoop::Quit() {
+void MessageLoop::QuitWhenIdle() {
   DCHECK_EQ(this, current());
   if (state_) {
-    state_->quit_received = true;
+    state_->quit_received_ = true;
   } else {
     NOTREACHED() << "Must be inside Run to call Quit";
   }
 }
 
 void MessageLoop::QuitNow() {
   DCHECK_EQ(this, current());
   if (state_) {
     pump_->Quit();
   } else {
     NOTREACHED() << "Must be inside Run to call Quit";
   }
 }
 
-static void QuitCurrent() {
-  MessageLoop::current()->Quit();
+void MessageLoop::QuitNowWithID(const RunID& run_id) {
+  DCHECK_EQ(this, current());
+
+  // Set quit_now_received_ so that the corresponding Run scope is quit as soon
+  // as it is returned to. It's also possible that the corresponding Run has not
+  // begun; in that case, this will cause the Run to immediately return.
+  run_id->quit_now_received_ = true;
+
+  if (!state_)
+    return;
+
+  // If the state_ pointer matches that of the RunIDObject, we're at the same
+  // Run scope, so quit now.
+  if (state_ == run_id->run_state_)
+    QuitNow();
+}
+
+static void QuitCurrentWhenIdle() {
+  MessageLoop::current()->QuitWhenIdle();
+}
+
+static void QuitCurrentNow() {
+  MessageLoop::current()->QuitNow();
+}
+
+static void QuitCurrentNowWithID(const MessageLoop::RunID& run_id) {
+  MessageLoop::current()->QuitNowWithID(run_id);
 }
 
 // static
-base::Closure MessageLoop::QuitClosure() {
-  return base::Bind(&QuitCurrent);
+base::Closure MessageLoop::QuitWhenIdleClosure() {
+  return base::Bind(&QuitCurrentWhenIdle);
+}
+
+// static
+base::Closure MessageLoop::QuitNowClosure() {
+  return base::Bind(&QuitCurrentNow);
+}
+
+// static
+base::Closure MessageLoop::QuitNowWithIDClosure(
+    const RunID& run_id) {
+  return base::Bind(&QuitCurrentNowWithID, run_id);
+}
+
+MessageLoop::RunID MessageLoop::GetRunID() {
+  return new RunIDObject();
 }
 
 void MessageLoop::SetNestableTasksAllowed(bool allowed) {
   if (nestable_tasks_allowed_ != allowed) {
     nestable_tasks_allowed_ = allowed;
     if (!nestable_tasks_allowed_)
       return;
     // Start the native pump if we are not already pumping.
     pump_->ScheduleWork();
   }
 }
 
 bool MessageLoop::NestableTasksAllowed() const {
   return nestable_tasks_allowed_;
 }
 
 bool MessageLoop::IsNested() {
-  return state_->run_depth > 1;
+  return state_->run_depth_ > 1;
 }
 
 void MessageLoop::AddTaskObserver(TaskObserver* task_observer) {
   DCHECK_EQ(this, current());
   task_observers_.AddObserver(task_observer);
 }
 
 void MessageLoop::RemoveTaskObserver(TaskObserver* task_observer) {
   DCHECK_EQ(this, current());
   task_observers_.RemoveObserver(task_observer);
@@ skipping 38 matching lines @@
   return;
 }
 #endif
 
 void MessageLoop::RunInternal() {
   DCHECK_EQ(this, current());
 
   StartHistogrammer();
 
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-  if (state_->dispatcher && type() == TYPE_UI) {
+  if (state_->dispatcher_ && type() == TYPE_UI) {
     static_cast<base::MessagePumpForUI*>(pump_.get())->
-        RunWithDispatcher(this, state_->dispatcher);
+        RunWithDispatcher(this, state_->dispatcher_);
     return;
   }
 #endif
 
   pump_->Run(this);
 }
 
 bool MessageLoop::ProcessNextDelayedNonNestableTask() {
-  if (state_->run_depth != 1)
+  if (state_->run_depth_ != 1)
     return false;
 
   if (deferred_non_nestable_work_queue_.empty())
     return false;
 
   PendingTask pending_task = deferred_non_nestable_work_queue_.front();
   deferred_non_nestable_work_queue_.pop();
 
   RunTask(pending_task);
   return true;
@@ skipping 27 matching lines @@
   FOR_EACH_OBSERVER(TaskObserver, task_observers_,
                     DidProcessTask(pending_task.time_posted));
 
   tracked_objects::ThreadData::TallyRunOnNamedThreadIfTracking(pending_task,
       start_time, tracked_objects::ThreadData::NowForEndOfRun());
 
   nestable_tasks_allowed_ = true;
 }
 
 bool MessageLoop::DeferOrRunPendingTask(const PendingTask& pending_task) {
-  if (pending_task.nestable || state_->run_depth == 1) {
+  if (pending_task.nestable || state_->run_depth_ == 1) {
     RunTask(pending_task);
     // Show that we ran a task (Note: a new one might arrive as a
     // consequence!).
     return true;
   }
 
   // We couldn't run the task now because we're in a nested message loop
   // and the task isn't nestable.
   deferred_non_nestable_work_queue_.push(pending_task);
   return false;
@@ skipping 202 matching lines @@
   if (!delayed_work_queue_.empty())
     *next_delayed_work_time = delayed_work_queue_.top().delayed_run_time;
 
   return DeferOrRunPendingTask(pending_task);
 }
 
 bool MessageLoop::DoIdleWork() {
   if (ProcessNextDelayedNonNestableTask())
     return true;
 
-  if (state_->quit_received)
+  if (state_->quit_received_)
     pump_->Quit();
 
   return false;
 }
 
 void MessageLoop::DeleteSoonInternal(const tracked_objects::Location& from_here,
                                      void(*deleter)(const void*),
                                      const void* object) {
   PostNonNestableTask(from_here, base::Bind(deleter, object));
 }
 
 void MessageLoop::ReleaseSoonInternal(
     const tracked_objects::Location& from_here,
     void(*releaser)(const void*),
     const void* object) {
   PostNonNestableTask(from_here, base::Bind(releaser, object));
 }
 
 //------------------------------------------------------------------------------
+// MessageLoop::RunState
+
+MessageLoop::RunState::RunState() {
+}
+
+MessageLoop::RunState::~RunState() {
+}
+
+//------------------------------------------------------------------------------
 // MessageLoop::AutoRunState
 
-MessageLoop::AutoRunState::AutoRunState(MessageLoop* loop) : loop_(loop) {
+MessageLoop::AutoRunState::AutoRunState(MessageLoop* loop, const RunID& run_id)
+    : loop_(loop) {
   // Make the loop reference us.
   previous_state_ = loop_->state_;
   if (previous_state_) {
-    run_depth = previous_state_->run_depth + 1;
+    run_depth_ = previous_state_->run_depth_ + 1;
   } else {
-    run_depth = 1;
+    run_depth_ = 1;
   }
   loop_->state_ = this;
 
+  if (run_id.get()) {
+    DCHECK(!run_id->used_);
+    run_state_id_ = run_id;
+    run_state_id_->used_ = true;
+    run_state_id_->run_state_ = this;
+  }
+
   // Initialize the other fields:
-  quit_received = false;
+  quit_received_ = false;
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-  dispatcher = NULL;
+  dispatcher_ = NULL;
 #endif
 }
 
 MessageLoop::AutoRunState::~AutoRunState() {
   loop_->state_ = previous_state_;
+  if (run_state_id_.get()) {
+    // run_state_id_->run_state_ points to 'this', so clear it.
+    run_state_id_->run_state_ = NULL;
+  }
+  if (previous_state_ && previous_state_->run_state_id_.get()
+      && previous_state_->run_state_id_->quit_now_received_)
+    MessageLoop::current()->QuitNow();
 }
 
 //------------------------------------------------------------------------------
 // MessageLoopForUI
 
 #if defined(OS_WIN)
 void MessageLoopForUI::DidProcessMessage(const MSG& message) {
   pump_win()->DidProcessMessage(message);
 }
 #endif  // defined(OS_WIN)
 
 #if defined(OS_ANDROID)
 void MessageLoopForUI::Start() {
   // No Histogram support for UI message loop as it is managed by Java side
   static_cast<base::MessagePumpForUI*>(pump_.get())->Start(this);
 }
 #endif
 
 #if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID)
 void MessageLoopForUI::AddObserver(Observer* observer) {
   pump_ui()->AddObserver(observer);
 }
 
 void MessageLoopForUI::RemoveObserver(Observer* observer) {
   pump_ui()->RemoveObserver(observer);
 }
 
 void MessageLoopForUI::RunWithDispatcher(Dispatcher* dispatcher) {
-  AutoRunState save_state(this);
-  state_->dispatcher = dispatcher;
+  AutoRunState save_state(this, NULL);
+  state_->dispatcher_ = dispatcher;
+  RunHandler();
+}
+
+void MessageLoopForUI::RunWithDispatcher(Dispatcher* dispatcher,
+                                         const RunID& run_id) {
+  AutoRunState save_state(this, run_id);
+  state_->dispatcher_ = dispatcher;
   RunHandler();
 }
 
 void MessageLoopForUI::RunAllPendingWithDispatcher(Dispatcher* dispatcher) {
-  AutoRunState save_state(this);
-  state_->dispatcher = dispatcher;
-  state_->quit_received = true;  // Means run until we would otherwise block.
+  AutoRunState save_state(this, NULL);
+  state_->dispatcher_ = dispatcher;
+  state_->quit_received_ = true;  // Means run until we would otherwise block.
   RunHandler();
 }
 
 #endif  //  !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID)
 
 //------------------------------------------------------------------------------
 // MessageLoopForIO
 
 #if defined(OS_WIN)
 
@@ skipping 14 matching lines @@
                                            Watcher *delegate) {
   return pump_libevent()->WatchFileDescriptor(
       fd,
       persistent,
       static_cast<base::MessagePumpLibevent::Mode>(mode),
       controller,
       delegate);
 }
 
 #endif