| Index: services/device/time_zone_monitor/time_zone_monitor_linux.cc
|
| diff --git a/services/device/time_zone_monitor/time_zone_monitor_linux.cc b/services/device/time_zone_monitor/time_zone_monitor_linux.cc
|
| index 22ab258bf5dc9c9baef235205b7cac7e78bdc087..fe580fe486a14a5a4b00d7917daa99131cc1d210 100644
|
| --- a/services/device/time_zone_monitor/time_zone_monitor_linux.cc
|
| +++ b/services/device/time_zone_monitor/time_zone_monitor_linux.cc
|
| @@ -59,14 +59,14 @@ class TimeZoneMonitorLinuxImpl
|
| main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
|
| file_task_runner_(file_task_runner),
|
| owner_(owner) {
|
| - DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
|
| file_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&TimeZoneMonitorLinuxImpl::StartWatchingOnFileThread, this));
|
| }
|
|
|
| void StopWatching() {
|
| - DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
|
| owner_ = NULL;
|
| file_task_runner_->PostTask(
|
| FROM_HERE,
|
| @@ -80,7 +80,7 @@ class TimeZoneMonitorLinuxImpl
|
|
|
| void StartWatchingOnFileThread() {
|
| base::ThreadRestrictions::AssertIOAllowed();
|
| - DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(file_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // There is no true standard for where time zone information is actually
|
| // stored. glibc uses /etc/localtime, uClibc uses /etc/TZ, and some older
|
| @@ -102,12 +102,12 @@ class TimeZoneMonitorLinuxImpl
|
| }
|
|
|
| void StopWatchingOnFileThread() {
|
| - DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(file_task_runner_->RunsTasksInCurrentSequence());
|
| file_path_watchers_.clear();
|
| }
|
|
|
| void OnTimeZoneFileChanged(const base::FilePath& path, bool error) {
|
| - DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(file_task_runner_->RunsTasksInCurrentSequence());
|
| main_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&TimeZoneMonitorLinuxImpl::OnTimeZoneFileChangedOnUIThread,
|
| @@ -115,7 +115,7 @@ class TimeZoneMonitorLinuxImpl
|
| }
|
|
|
| void OnTimeZoneFileChangedOnUIThread() {
|
| - DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
|
| if (owner_) {
|
| owner_->NotifyClientsFromImpl();
|
| }
|
|
|