| Index: chrome/browser/chromeos/policy/device_status_collector.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
|
| index caef23633ab758b7cd4a48eedf746322e898ca1d..521edf74c16c0b7264f2a219fc564c84db2b45a9 100644
|
| --- a/chrome/browser/chromeos/policy/device_status_collector.cc
|
| +++ b/chrome/browser/chromeos/policy/device_status_collector.cc
|
| @@ -357,9 +357,7 @@ class GetStatusState : public base::RefCountedThreadSafe<GetStatusState> {
|
|
|
| // Call out to the blocking pool to sample disk volume info.
|
| base::PostTaskWithTraitsAndReplyWithResult(
|
| - FROM_HERE,
|
| - base::TaskTraits().MayBlock().WithPriority(
|
| - base::TaskPriority::BACKGROUND),
|
| + FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
|
| base::Bind(volume_info_fetcher, mount_points),
|
| base::Bind(&GetStatusState::OnVolumeInfoReceived, this));
|
| }
|
| @@ -369,9 +367,7 @@ class GetStatusState : public base::RefCountedThreadSafe<GetStatusState> {
|
| const policy::DeviceStatusCollector::CPUTempFetcher& cpu_temp_fetcher) {
|
| // Call out to the blocking pool to sample CPU temp.
|
| base::PostTaskWithTraitsAndReplyWithResult(
|
| - FROM_HERE,
|
| - base::TaskTraits().MayBlock().WithPriority(
|
| - base::TaskPriority::BACKGROUND),
|
| + FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
|
| cpu_temp_fetcher,
|
| base::Bind(&GetStatusState::OnCPUTempInfoReceived, this));
|
| }
|
| @@ -499,17 +495,13 @@ DeviceStatusCollector::DeviceStatusCollector(
|
|
|
| // Get the the OS and firmware version info.
|
| base::PostTaskWithTraitsAndReplyWithResult(
|
| - FROM_HERE,
|
| - base::TaskTraits().MayBlock().WithPriority(
|
| - base::TaskPriority::BACKGROUND),
|
| + FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
|
| base::Bind(&chromeos::version_loader::GetVersion,
|
| chromeos::version_loader::VERSION_FULL),
|
| base::Bind(&DeviceStatusCollector::OnOSVersion,
|
| weak_factory_.GetWeakPtr()));
|
| base::PostTaskWithTraitsAndReplyWithResult(
|
| - FROM_HERE,
|
| - base::TaskTraits().MayBlock().WithPriority(
|
| - base::TaskPriority::BACKGROUND),
|
| + FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
|
| base::Bind(&chromeos::version_loader::GetFirmware),
|
| base::Bind(&DeviceStatusCollector::OnOSFirmware,
|
| weak_factory_.GetWeakPtr()));
|
| @@ -727,9 +719,7 @@ void DeviceStatusCollector::SampleResourceUsage() {
|
|
|
| // Call out to the blocking pool to sample CPU stats.
|
| base::PostTaskWithTraitsAndReplyWithResult(
|
| - FROM_HERE,
|
| - base::TaskTraits().MayBlock().WithPriority(
|
| - base::TaskPriority::BACKGROUND),
|
| + FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
|
| cpu_statistics_fetcher_,
|
| base::Bind(&DeviceStatusCollector::ReceiveCPUStatistics,
|
| weak_factory_.GetWeakPtr()));
|
|
|