| Index: content/browser/service_worker/service_worker_version.cc
|
| diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
|
| index d586d7426ebb0b25aff200f1a99f3ce826d114da..9d04c86ddc1dd7df837ff2fc6333fbcbdafc9579 100644
|
| --- a/content/browser/service_worker/service_worker_version.cc
|
| +++ b/content/browser/service_worker/service_worker_version.cc
|
| @@ -39,6 +39,7 @@
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| +#include "content/public/common/background_sync.mojom.h"
|
| #include "content/public/common/child_process_host.h"
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -789,15 +790,15 @@ void ServiceWorkerVersion::DispatchFetchEvent(
|
| }
|
| }
|
|
|
| -void ServiceWorkerVersion::DispatchSyncEvent(const StatusCallback& callback) {
|
| +void ServiceWorkerVersion::DispatchSyncEvent(SyncRegistrationPtr registration,
|
| + const StatusCallback& callback) {
|
| DCHECK_EQ(ACTIVATED, status()) << status();
|
| if (running_status() != RUNNING) {
|
| // Schedule calling this method after starting the worker.
|
| - StartWorker(base::Bind(&RunTaskAfterStartWorker,
|
| - weak_factory_.GetWeakPtr(), callback,
|
| - base::Bind(&self::DispatchSyncEvent,
|
| - weak_factory_.GetWeakPtr(),
|
| - callback)));
|
| + StartWorker(base::Bind(
|
| + &RunTaskAfterStartWorker, weak_factory_.GetWeakPtr(), callback,
|
| + base::Bind(&self::DispatchSyncEvent, weak_factory_.GetWeakPtr(),
|
| + base::Passed(registration.Pass()), callback)));
|
| return;
|
| }
|
|
|
| @@ -810,13 +811,9 @@ void ServiceWorkerVersion::DispatchSyncEvent(const StatusCallback& callback) {
|
| // https://codereview.chromium.org/1210643002 lands.
|
| }
|
|
|
| - // TODO(iclelland): Replace this with the real event registration details
|
| - // crbug.com/482066
|
| - content::SyncRegistrationPtr null_event(content::SyncRegistration::New());
|
| -
|
| background_sync_dispatcher_->Sync(
|
| - null_event.Pass(), base::Bind(&self::OnSyncEventFinished,
|
| - weak_factory_.GetWeakPtr(), request_id));
|
| + registration.Pass(), base::Bind(&self::OnSyncEventFinished,
|
| + weak_factory_.GetWeakPtr(), request_id));
|
| }
|
|
|
| void ServiceWorkerVersion::DispatchNotificationClickEvent(
|
|
|