| Index: chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
|
| diff --git a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
|
| index 02db1f21cbdc131c754eccc3cb99e40565ca250d..7b67246a547195232a0ebc5243d6fc7285bf477c 100644
|
| --- a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
|
| @@ -158,7 +158,7 @@ class SystemLogUploaderTest : public testing::Test {
|
| // Given a pending task to upload system logs.
|
| void RunPendingUploadTaskAndCheckNext(const SystemLogUploader& uploader,
|
| base::TimeDelta expected_delay) {
|
| - EXPECT_FALSE(task_runner_->GetPendingTasks().empty());
|
| + EXPECT_TRUE(task_runner_->HasPendingTask());
|
| task_runner_->RunPendingTasks();
|
|
|
| // The previous task should have uploaded another log upload task.
|
| @@ -187,7 +187,7 @@ class SystemLogUploaderTest : public testing::Test {
|
|
|
| // Check disabled system log uploads by default.
|
| TEST_F(SystemLogUploaderTest, Basic) {
|
| - EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
|
| + EXPECT_FALSE(task_runner_->HasPendingTask());
|
|
|
| std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
|
| new MockSystemLogDelegate(false, SystemLogUploader::SystemLogs()));
|
| @@ -199,7 +199,7 @@ TEST_F(SystemLogUploaderTest, Basic) {
|
|
|
| // One success task pending.
|
| TEST_F(SystemLogUploaderTest, SuccessTest) {
|
| - EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
|
| + EXPECT_FALSE(task_runner_->HasPendingTask());
|
|
|
| std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
|
| new MockSystemLogDelegate(false, SystemLogUploader::SystemLogs()));
|
| @@ -216,7 +216,7 @@ TEST_F(SystemLogUploaderTest, SuccessTest) {
|
|
|
| // Three failed responses recieved.
|
| TEST_F(SystemLogUploaderTest, ThreeFailureTest) {
|
| - EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
|
| + EXPECT_FALSE(task_runner_->HasPendingTask());
|
|
|
| std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
|
| new MockSystemLogDelegate(true, SystemLogUploader::SystemLogs()));
|
| @@ -242,7 +242,7 @@ TEST_F(SystemLogUploaderTest, ThreeFailureTest) {
|
|
|
| // Check header fields of system log files to upload.
|
| TEST_F(SystemLogUploaderTest, CheckHeaders) {
|
| - EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
|
| + EXPECT_FALSE(task_runner_->HasPendingTask());
|
|
|
| SystemLogUploader::SystemLogs system_logs = GenerateTestSystemLogFiles();
|
| std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
|
| @@ -260,7 +260,7 @@ TEST_F(SystemLogUploaderTest, CheckHeaders) {
|
|
|
| // Disable system log uploads after one failed log upload.
|
| TEST_F(SystemLogUploaderTest, DisableLogUpload) {
|
| - EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
|
| + EXPECT_FALSE(task_runner_->HasPendingTask());
|
|
|
| std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
|
| new MockSystemLogDelegate(true, SystemLogUploader::SystemLogs()));
|
|
|