Use constant for invalid request_id in EmbeddedWorker messaging

BUG=313530
TEST=existing EW tests should pass

Review URL: https://codereview.chromium.org/149673005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249387 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 5 deletions

diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 3a81ca4..7948df5 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -156,7 +156,8 @@ void ServiceWorkerVersion::SendMessage(
     return;
   }
 
-  ServiceWorkerStatusCode status = embedded_worker_->SendMessage(-1, message);
+  ServiceWorkerStatusCode status = embedded_worker_->SendMessage(
+      kInvalidRequestId, message);
   RunSoon(base::Bind(callback, status));
 }
 
@@ -198,7 +199,8 @@ bool ServiceWorkerVersion::DispatchFetchEvent(
   if (status() != RUNNING)
     return false;
   return embedded_worker_->SendMessage(
-      -1, ServiceWorkerMsg_FetchEvent(request)) == SERVICE_WORKER_OK;
+      kInvalidRequestId, ServiceWorkerMsg_FetchEvent(request))
+          == SERVICE_WORKER_OK;
 }
 
 void ServiceWorkerVersion::AddProcessToWorker(int process_id) {
diff --git a/content/common/service_worker/service_worker_types.h b/content/common/service_worker/service_worker_types.h
index 7943d45..abb13b9 100644
--- a/content/common/service_worker/service_worker_types.h
+++ b/content/common/service_worker/service_worker_types.h
@@ -17,6 +17,11 @@
 
 namespace content {
 
+// Indicates invalid request ID (i.e. the sender does not expect it gets
+// response for the message) for messaging between browser process
+// and embedded worker.
+const static int kInvalidRequestId = -1;
+
 // To dispatch fetch request from browser to child process.
 // TODO(kinuko): This struct will definitely need more fields and
 // we'll probably want to have response struct/class too.
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index 34c858b..2930ce2 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -17,7 +17,7 @@ ServiceWorkerScriptContext::ServiceWorkerScriptContext(
     blink::WebServiceWorkerContextProxy* proxy)
     : embedded_context_(embedded_context),
       proxy_(proxy),
-      current_request_id_(-1) {
+      current_request_id_(kInvalidRequestId) {
 }
 
 ServiceWorkerScriptContext::~ServiceWorkerScriptContext() {}
@@ -25,7 +25,7 @@ ServiceWorkerScriptContext::~ServiceWorkerScriptContext() {}
 void ServiceWorkerScriptContext::OnMessageReceived(
     int request_id,
     const IPC::Message& message) {
-  DCHECK_EQ(-1, current_request_id_);
+  DCHECK_EQ(kInvalidRequestId, current_request_id_);
   current_request_id_ = request_id;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceWorkerScriptContext, message)
@@ -34,7 +34,7 @@ void ServiceWorkerScriptContext::OnMessageReceived(
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
-  current_request_id_ = -1;
+  current_request_id_ = kInvalidRequestId;
 }
 
 void ServiceWorkerScriptContext::DidHandleInstallEvent(int request_id) {