| Index: content/browser/service_worker/service_worker_dispatcher_host.cc
|
| diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc
|
| index 4cee0e102e3fbde729fbce0b551fa85555ff1002..12e715802784b6091e0523841d579c96479b6ab3 100644
|
| --- a/content/browser/service_worker/service_worker_dispatcher_host.cc
|
| +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc
|
| @@ -71,7 +71,7 @@ bool ServiceWorkerDispatcherHost::OnMessageReceived(
|
| void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
|
| int32 thread_id,
|
| int32 request_id,
|
| - const GURL& scope,
|
| + const GURL& pattern,
|
| const GURL& script_url) {
|
| if (!context_ || !context_->IsEnabled()) {
|
| Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
|
| @@ -85,7 +85,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
|
| // TODO(alecflett): This check is insufficient for release. Add a
|
| // ServiceWorker-specific policy query in
|
| // ChildProcessSecurityImpl. See http://crbug.com/311631.
|
| - if (scope.GetOrigin() != script_url.GetOrigin()) {
|
| + if (pattern.GetOrigin() != script_url.GetOrigin()) {
|
| Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
|
| thread_id,
|
| request_id,
|
| @@ -98,9 +98,10 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
|
| thread_id, request_id, NextWorkerId()));
|
| }
|
|
|
| -void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker(int32 thread_id,
|
| - int32 request_id,
|
| - const GURL& scope) {
|
| +void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker(
|
| + int32 thread_id,
|
| + int32 request_id,
|
| + const GURL& pattern) {
|
| // TODO(alecflett): This check is insufficient for release. Add a
|
| // ServiceWorker-specific policy query in
|
| // ChildProcessSecurityImpl. See http://crbug.com/311631.
|
|
|