aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQijiang Fan <fqj@chromium.org>2020-07-06 12:51:46 +0900
committerCommit Bot <commit-bot@chromium.org>2020-07-07 07:31:01 +0000
commitfe014639c72a2214d31e235654d2926e05418beb (patch)
tree93e75320859da432caa97198614b0365d83b9f5b
parent584bd4cc322ef46c144bb79a1fd10d1ef8cfad7a (diff)
downloadplatform_external_libbrillo-fe014639c72a2214d31e235654d2926e05418beb.tar.gz
platform_external_libbrillo-fe014639c72a2214d31e235654d2926e05418beb.tar.bz2
platform_external_libbrillo-fe014639c72a2214d31e235654d2926e05418beb.zip
Use base::test::TaskEnvironment.
base::test::ScopedTaskEnvironment will be renamed to TaskEnvironment. BUG=chromium:1094927 TEST=CQ Exempt-From-Owner-Approval: Mechanical change involving a lot of owners. Change-Id: I265dba61f8afdd960ca66d1e032a05b6407e74c8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2282182 Reviewed-by: Maksim Ivanov <emaxx@chromium.org> Reviewed-by: Prashant Malani <pmalani@chromium.org> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> Commit-Queue: Qijiang Fan <fqj@google.com> Tested-by: Qijiang Fan <fqj@google.com> Cr-Mirrored-From: https://chromium.googlesource.com/chromiumos/platform2 Cr-Mirrored-Commit: 05b5852bbf00f85e097be08bf5344d2f735171d7
-rw-r--r--brillo/future_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/brillo/future_test.cc b/brillo/future_test.cc
index c9bc9b9..29ae472 100644
--- a/brillo/future_test.cc
+++ b/brillo/future_test.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include <array>
-#include <base/test/scoped_task_environment.h>
+#include <base/test/task_environment.h>
#include <base/threading/sequenced_task_runner_handle.h>
#include <base/threading/platform_thread.h>
#include <base/threading/thread.h>
@@ -31,7 +31,7 @@ class FutureTest : public ::testing::Test {
protected:
// Both single and multi threaded usage of future is tested
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread worker_thread_{"worker thread"};
scoped_refptr<base::SequencedTaskRunner> task_runner_;
};