summaryrefslogtreecommitdiff
path: root/chromium/base/timer/timer.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-20 15:06:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-22 11:48:58 +0000
commitdaa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch)
tree96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/base/timer/timer.cc
parentbe59a35641616a4cf23c4a13fa0632624b021c1b (diff)
downloadqtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/timer/timer.cc')
-rw-r--r--chromium/base/timer/timer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/base/timer/timer.cc b/chromium/base/timer/timer.cc
index 1f6efcc7e3d..5540994dcb7 100644
--- a/chromium/base/timer/timer.cc
+++ b/chromium/base/timer/timer.cc
@@ -75,13 +75,13 @@ Timer::Timer(bool retain_user_task, bool is_repeating, TickClock* tick_clock)
origin_sequence_checker_.DetachFromSequence();
}
-Timer::Timer(const tracked_objects::Location& posted_from,
+Timer::Timer(const Location& posted_from,
TimeDelta delay,
const base::Closure& user_task,
bool is_repeating)
: Timer(posted_from, delay, user_task, is_repeating, nullptr) {}
-Timer::Timer(const tracked_objects::Location& posted_from,
+Timer::Timer(const Location& posted_from,
TimeDelta delay,
const base::Closure& user_task,
bool is_repeating,
@@ -125,7 +125,7 @@ void Timer::SetTaskRunner(scoped_refptr<SequencedTaskRunner> task_runner) {
task_runner_.swap(task_runner);
}
-void Timer::Start(const tracked_objects::Location& posted_from,
+void Timer::Start(const Location& posted_from,
TimeDelta delay,
const base::Closure& user_task) {
DCHECK(origin_sequence_checker_.CalledOnValidSequence());