[content] Use DoSomeWork() in NestedMessagePumpAndroid.

MessagePump::Delegate::DoWork/DoDelayedWork are being removed in favor
of DoSomeWork. This CL updates NestedMessagePumpAndroid to use
DoSomeWork to unblock that migration.

Bug: 885371
Change-Id: I0bd84f9f54f7509f7cbfed985d80ed3c6150f8a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070330Reviewed-by: Etienne Pierre-Doray <etiennep@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744357}

content/public/test/nested_message_pump_android.cc

@@ -34,9 +34,6 @@ struct NestedMessagePumpAndroid::RunState {
 
   // Used to sleep until there is more work to do.
   base::WaitableEvent waitable_event;
-
-  // The time at which we should call DoDelayedWork.
-  base::TimeTicks delayed_work_time;
 };
 
 NestedMessagePumpAndroid::NestedMessagePumpAndroid()
@@ -63,23 +60,19 @@ void NestedMessagePumpAndroid::Run(Delegate* delegate) {
     if (state_->should_quit)
       break;
 
-    bool did_work = state_->delegate->DoWork();
-    if (state_->should_quit)
-      break;
-
-    did_work |= state_->delegate->DoDelayedWork(&state_->delayed_work_time);
+    Delegate::NextWorkInfo next_work_info = delegate->DoSomeWork();
+    bool has_more_immediate_work = next_work_info.is_immediate();
     if (state_->should_quit)
       break;
 
-    if (did_work) {
+    if (has_more_immediate_work)
       continue;
-    }
 
-    did_work = state_->delegate->DoIdleWork();
+    has_more_immediate_work = state_->delegate->DoIdleWork();
     if (state_->should_quit)
       break;
 
-    if (did_work)
+    if (has_more_immediate_work)
       continue;
 
     // No native tasks to process right now. Process tasks from the Java
@@ -88,20 +81,14 @@ void NestedMessagePumpAndroid::Run(Delegate* delegate) {
     bool ret = Java_NestedSystemMessageHandler_runNestedLoopTillIdle(env);
     CHECK(ret) << "Error running java message loop, tests will likely fail.";
 
-    if (state_->delayed_work_time.is_null()) {
+    if (next_work_info.delayed_run_time.is_max()) {
       state_->waitable_event.TimedWait(max_delay);
     } else {
-      base::TimeDelta delay =
-          state_->delayed_work_time - base::TimeTicks::Now();
+      base::TimeDelta delay = next_work_info.remaining_delay();
       if (delay > max_delay)
         delay = max_delay;
-      if (delay > base::TimeDelta()) {
-        state_->waitable_event.TimedWait(delay);
-      } else {
-        // It looks like delayed_work_time indicates a time in the past, so we
-        // need to call DoDelayedWork now.
-        state_->delayed_work_time = base::TimeTicks();
-      }
+      DCHECK_GT(delay, base::TimeDelta());
+      state_->waitable_event.TimedWait(delay);
     }
   }
 
@@ -127,13 +114,11 @@ void NestedMessagePumpAndroid::ScheduleWork() {
 
 void NestedMessagePumpAndroid::ScheduleDelayedWork(
     const base::TimeTicks& delayed_work_time) {
-  if (state_) {
-    // We know that we can't be blocked on Wait right now since this method can
-    // only be called on the same thread as Run, so we only need to update our
-    // record of how long to sleep when we do sleep.
-    state_->delayed_work_time = delayed_work_time;
-    return;
-  }
+  // Since this is always called from the same thread as Run(), there is nothing
+  // to do as the loop is already running. It will wait in Run() with the
+  // correct timeout when it's out of immediate tasks.
+  // TODO(gab): Consider removing ScheduleDelayedWork() when all pumps function
+  // this way (bit.ly/merge-message-pump-do-work).
 }
 
 }  // namespace content