Merge 233099 "Kill worker process by way of a sync IPC message b..."

content/common/worker_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines messages between the browser and worker process, as well as between
 // the renderer and worker process.
 
 // Multiply-included message file, hence no include guard.
 
 #include <string>
@@ skipping 124 matching lines @@
                             GURL /* origin url */,
                             bool /* result */)
 
 // Sent by the worker process to check whether access to IndexedDB is allowed.
 IPC_SYNC_MESSAGE_CONTROL3_1(WorkerProcessHostMsg_AllowIndexedDB,
                             int /* worker_route_id */,
                             GURL /* origin url */,
                             string16 /* database name */,
                             bool /* result */)
 
+// Sent by the worker process to request being killed.
+IPC_SYNC_MESSAGE_CONTROL0_0(WorkerProcessHostMsg_ForceKillWorker);
+
+
 //-----------------------------------------------------------------------------
 // Worker messages
 // These are messages sent from the renderer process to the worker process.
 IPC_MESSAGE_ROUTED5(WorkerMsg_StartWorkerContext,
                     GURL /* url */,
                     string16  /* user_agent */,
                     string16  /* source_code */,
                     string16  /* content_security_policy */,
                     WebKit::WebContentSecurityPolicyType)
 
@@ skipping 25 matching lines @@
 
 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject,
                     bool /* bool has_pending_activity */)
 
 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity,
                     bool /* bool has_pending_activity */)
 
 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed,
                      int /* worker_route_id */)
 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed)