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

content/browser/worker_host/worker_process_host.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.
 
 #ifndef CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_
 #define CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 189 matching lines @@
                        const string16& display_name,
                        unsigned long estimated_size,
                        bool* result);
   void OnAllowFileSystem(int worker_route_id,
                          const GURL& url,
                          bool* result);
   void OnAllowIndexedDB(int worker_route_id,
                         const GURL& url,
                         const string16& name,
                         bool* result);
+  void OnForceKillWorkerProcess();
 
   // Relays a message to the given endpoint.  Takes care of parsing the message
   // if it contains a message port and sending it a valid route id.
   void RelayMessage(const IPC::Message& message,
                     WorkerMessageFilter* filter,
                     int route_id);
 
   void ShutdownSocketStreamDispatcherHostIfNecessary();
 
   virtual bool CanShutdown() OVERRIDE;
@@ skipping 34 matching lines @@
  public:
   WorkerProcessHostIterator()
       : BrowserChildProcessHostTypeIterator<WorkerProcessHost>(
             PROCESS_TYPE_WORKER) {
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_