| Index: content/browser/devtools/protocol/service_worker_handler.cc
|
| diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
|
| index 6f426f4037da17c5f59d117dd3debf1e5d4d8d0a..887300c619550cdef6dc1b6547cc74a5f5028a45 100644
|
| --- a/content/browser/devtools/protocol/service_worker_handler.cc
|
| +++ b/content/browser/devtools/protocol/service_worker_handler.cc
|
| @@ -170,11 +170,11 @@ void GetDevToolsRouteInfoOnIO(
|
| }
|
| }
|
|
|
| -Response CreateContextErrorResoponse() {
|
| +Response CreateContextErrorResponse() {
|
| return Response::InternalError("Could not connect to the context");
|
| }
|
|
|
| -Response CreateInvalidVersionIdErrorResoponse() {
|
| +Response CreateInvalidVersionIdErrorResponse() {
|
| return Response::InternalError("Invalid version ID");
|
| }
|
|
|
| @@ -302,7 +302,7 @@ Response ServiceWorkerHandler::Unregister(const std::string& scope_url) {
|
| if (!enabled_)
|
| return Response::OK();
|
| if (!context_)
|
| - return CreateContextErrorResoponse();
|
| + return CreateContextErrorResponse();
|
| context_->UnregisterServiceWorker(GURL(scope_url), base::Bind(&ResultNoOp));
|
| return Response::OK();
|
| }
|
| @@ -311,7 +311,7 @@ Response ServiceWorkerHandler::StartWorker(const std::string& scope_url) {
|
| if (!enabled_)
|
| return Response::OK();
|
| if (!context_)
|
| - return CreateContextErrorResoponse();
|
| + return CreateContextErrorResponse();
|
| context_->StartServiceWorker(GURL(scope_url), base::Bind(&StatusNoOp));
|
| return Response::OK();
|
| }
|
| @@ -320,10 +320,10 @@ Response ServiceWorkerHandler::StopWorker(const std::string& version_id) {
|
| if (!enabled_)
|
| return Response::OK();
|
| if (!context_)
|
| - return CreateContextErrorResoponse();
|
| + return CreateContextErrorResponse();
|
| int64 id = 0;
|
| if (!base::StringToInt64(version_id, &id))
|
| - return CreateInvalidVersionIdErrorResoponse();
|
| + return CreateInvalidVersionIdErrorResponse();
|
| BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
| base::Bind(&StopServiceWorkerOnIO, context_, id));
|
| return Response::OK();
|
| @@ -334,7 +334,7 @@ Response ServiceWorkerHandler::UpdateRegistration(
|
| if (!enabled_)
|
| return Response::OK();
|
| if (!context_)
|
| - return CreateContextErrorResoponse();
|
| + return CreateContextErrorResponse();
|
| context_->UpdateRegistration(GURL(scope_url));
|
| return Response::OK();
|
| }
|
| @@ -343,11 +343,11 @@ Response ServiceWorkerHandler::InspectWorker(const std::string& version_id) {
|
| if (!enabled_)
|
| return Response::OK();
|
| if (!context_)
|
| - return CreateContextErrorResoponse();
|
| + return CreateContextErrorResponse();
|
|
|
| int64 id = 0;
|
| if (!base::StringToInt64(version_id, &id))
|
| - return CreateInvalidVersionIdErrorResoponse();
|
| + return CreateInvalidVersionIdErrorResponse();
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(&GetDevToolsRouteInfoOnIO, context_, id,
|
| @@ -356,6 +356,19 @@ Response ServiceWorkerHandler::InspectWorker(const std::string& version_id) {
|
| return Response::OK();
|
| }
|
|
|
| +Response ServiceWorkerHandler::SkipWaiting(const std::string& version_id) {
|
| + if (!enabled_)
|
| + return Response::OK();
|
| + if (!context_)
|
| + return CreateContextErrorResponse();
|
| +
|
| + int64 id = 0;
|
| + if (!base::StringToInt64(version_id, &id))
|
| + return CreateInvalidVersionIdErrorResponse();
|
| + context_->SimulateSkipWaiting(id);
|
| + return Response::OK();
|
| +}
|
| +
|
| Response ServiceWorkerHandler::SetDebugOnStart(bool debug_on_start) {
|
| ServiceWorkerDevToolsManager::GetInstance()
|
| ->set_debug_service_worker_on_start(debug_on_start);
|
| @@ -369,10 +382,10 @@ Response ServiceWorkerHandler::DeliverPushMessage(
|
| if (!enabled_)
|
| return Response::OK();
|
| if (!render_frame_host_)
|
| - return CreateContextErrorResoponse();
|
| + return CreateContextErrorResponse();
|
| int64 id = 0;
|
| if (!base::StringToInt64(registration_id, &id))
|
| - return CreateInvalidVersionIdErrorResoponse();
|
| + return CreateInvalidVersionIdErrorResponse();
|
| BrowserContext::DeliverPushMessage(
|
| render_frame_host_->GetProcess()->GetBrowserContext(), GURL(origin), id,
|
| data, base::Bind(&PushDeliveryNoOp));
|
|
|