summaryrefslogtreecommitdiff
path: root/chromium/components/component_updater/timer_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-17 13:57:45 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-19 13:44:40 +0000
commit6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch)
treeb87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/components/component_updater/timer_unittest.cc
parentec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff)
downloadqtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/component_updater/timer_unittest.cc')
-rw-r--r--chromium/components/component_updater/timer_unittest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/components/component_updater/timer_unittest.cc b/chromium/components/component_updater/timer_unittest.cc
index 2c80e84d2a2..c90ae025147 100644
--- a/chromium/components/component_updater/timer_unittest.cc
+++ b/chromium/components/component_updater/timer_unittest.cc
@@ -4,8 +4,8 @@
#include <string>
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "base/time/time.h"
#include "components/component_updater/timer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -16,11 +16,13 @@ namespace component_updater {
class ComponentUpdaterTimerTest : public testing::Test {
public:
- ComponentUpdaterTimerTest() {}
+ ComponentUpdaterTimerTest()
+ : scoped_task_environment_(
+ base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
~ComponentUpdaterTimerTest() override {}
private:
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
};
TEST_F(ComponentUpdaterTimerTest, Start) {