Migrate some tests off of RunLoop::QuitCurrent*Deprecated().

This is a partial reland of b035cfda,
which was reviewed on https://chromium-review.googlesource.com/1082980

TBR: gab, thakis
Bug: 844016
Change-Id: I56847225b6eec13f182d03de5cf831b7c5362ad7
Reviewed-on: https://chromium-review.googlesource.com/1123888Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572109}

base/files/file_path_watcher_unittest.cc

@@ -188,12 +188,16 @@ class FilePathWatcherTest : public testing::Test {
                   bool recursive_watch) WARN_UNUSED_RESULT;
 
   bool WaitForEvents() WARN_UNUSED_RESULT {
+    return WaitForEventsWithTimeout(TestTimeouts::action_timeout());
+  }
+
+  bool WaitForEventsWithTimeout(TimeDelta timeout) WARN_UNUSED_RESULT {
     RunLoop run_loop;
     collector_->Reset(run_loop.QuitClosure());
 
     // Make sure we timeout if we don't get notified.
     ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-        FROM_HERE, run_loop.QuitClosure(), TestTimeouts::action_timeout());
+        FROM_HERE, run_loop.QuitClosure(), timeout);
     run_loop.Run();
     return collector_->Success();
   }
@@ -853,10 +857,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
   // We should not get notified in this case as it hasn't affected our ability
   // to access the file.
   ASSERT_TRUE(ChangeFilePermissions(test_dir1, Read, false));
-  loop_.task_runner()->PostDelayedTask(
-      FROM_HERE, RunLoop::QuitCurrentWhenIdleClosureDeprecated(),
-      TestTimeouts::tiny_timeout());
-  ASSERT_FALSE(WaitForEvents());
+  ASSERT_FALSE(WaitForEventsWithTimeout(TestTimeouts::tiny_timeout()));
   ASSERT_TRUE(ChangeFilePermissions(test_dir1, Read, true));
 
   // We should get notified in this case because filepathwatcher can no

chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

@@ -435,14 +435,21 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_TabIndicator) {
           chrome::GetTabAlertStateForContents(contents);
       if (alert_state != last_alert_state_) {
         last_alert_state_ = alert_state;
-        base::ThreadTaskRunnerHandle::Get()->PostTask(
-            FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
+        if (on_tab_changed_)
+          std::move(on_tab_changed_).Run();
       }
     }
 
+    void WaitForTabChange() {
+      base::RunLoop run_loop;
+      on_tab_changed_ = run_loop.QuitClosure();
+      run_loop.Run();
+    }
+
    private:
     Browser* const browser_;
     TabAlertState last_alert_state_;
+    base::OnceClosure on_tab_changed_;
   };
 
   IndicatorChangeObserver observer(browser());
@@ -462,7 +469,7 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_TabIndicator) {
       EXPECT_EQ(TabAlertState::TAB_CAPTURING, observer.last_alert_state());
       return;
     }
-    content::RunMessageLoop();
+    observer.WaitForTabChange();
   }
 }
 

chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc

@@ -137,7 +137,6 @@ class SyncableFileOperationRunnerTest : public testing::Test {
     SCOPED_TRACE(testing::Message() << location.ToString());
     EXPECT_EQ(expect, status);
     ++callback_count_;
-    base::RunLoop::QuitCurrentWhenIdleDeprecated();
   }
 
   bool CreateTempFile(base::FilePath* path) {
@@ -409,7 +408,7 @@ TEST_F(SyncableFileOperationRunnerTest, Cancel) {
           URL(kFile), 10, ExpectStatus(FROM_HERE, File::FILE_OK));
   file_system_.operation_runner()->Cancel(
       id, ExpectStatus(FROM_HERE, File::FILE_ERROR_INVALID_OPERATION));
-  base::RunLoop().Run();
+  content::RunAllTasksUntilIdle();
   EXPECT_EQ(2, callback_count_);
 }