| Index: content/browser/service_worker/service_worker_version_unittest.cc
|
| diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc
|
| index f3d1aeb8f70d367dfb10055d6a6384b299f7d614..92f1a776a812d8ceb9a2d11353c5d198119b8918 100644
|
| --- a/content/browser/service_worker/service_worker_version_unittest.cc
|
| +++ b/content/browser/service_worker/service_worker_version_unittest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "content/browser/service_worker/service_worker_test_utils.h"
|
| #include "content/browser/service_worker/service_worker_version.h"
|
| #include "content/common/service_worker/service_worker_utils.h"
|
| +#include "content/public/common/push_event_payload.h"
|
| #include "content/public/test/mock_render_process_host.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "content/public/test/test_mojo_service.mojom.h"
|
| @@ -708,7 +709,7 @@ TEST_F(ServiceWorkerVersionTest, StaleUpdate_FreshWorker) {
|
| registration_->SetActiveVersion(version_);
|
| registration_->set_last_update_check(base::Time::Now());
|
| version_->DispatchPushEvent(CreateReceiverOnCurrentThread(&status),
|
| - std::string());
|
| + PushEventPayload());
|
| base::RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(SERVICE_WORKER_OK, status);
|
| @@ -740,7 +741,7 @@ TEST_F(ServiceWorkerVersionTest, StaleUpdate_StartWorker) {
|
| registration_->SetActiveVersion(version_);
|
| registration_->set_last_update_check(GetYesterday());
|
| version_->DispatchPushEvent(CreateReceiverOnCurrentThread(&status),
|
| - std::string());
|
| + PushEventPayload());
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_EQ(SERVICE_WORKER_OK, status);
|
| EXPECT_FALSE(version_->stale_time_.is_null());
|
| @@ -763,7 +764,7 @@ TEST_F(ServiceWorkerVersionTest, StaleUpdate_RunningWorker) {
|
| registration_->SetActiveVersion(version_);
|
| registration_->set_last_update_check(base::Time::Now());
|
| version_->DispatchPushEvent(CreateReceiverOnCurrentThread(&status),
|
| - std::string());
|
| + PushEventPayload());
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_EQ(SERVICE_WORKER_OK, status);
|
| EXPECT_TRUE(version_->stale_time_.is_null());
|
| @@ -799,9 +800,9 @@ TEST_F(ServiceWorkerVersionTest, StaleUpdate_DoNotDeferTimer) {
|
|
|
| // Stale time is not deferred.
|
| version_->DispatchPushEvent(
|
| - base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), std::string());
|
| + base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), PushEventPayload());
|
| version_->DispatchPushEvent(
|
| - base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), std::string());
|
| + base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), PushEventPayload());
|
| EXPECT_EQ(stale_time, version_->stale_time_);
|
|
|
| // Timeout triggers the update.
|
| @@ -812,11 +813,11 @@ TEST_F(ServiceWorkerVersionTest, StaleUpdate_DoNotDeferTimer) {
|
| // Update timer is not deferred.
|
| base::TimeTicks run_time = version_->update_timer_.desired_run_time();
|
| version_->DispatchPushEvent(
|
| - base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), std::string());
|
| + base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), PushEventPayload());
|
| version_->DispatchPushEvent(
|
| - base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), std::string());
|
| + base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), PushEventPayload());
|
| version_->DispatchPushEvent(
|
| - base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), std::string());
|
| + base::Bind(&ServiceWorkerUtils::NoOpStatusCallback), PushEventPayload());
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_TRUE(version_->stale_time_.is_null());
|
| EXPECT_EQ(run_time, version_->update_timer_.desired_run_time());
|
|
|