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

content/worker/worker_thread.h

Index: content/worker/worker_thread.h
===================================================================
--- content/worker/worker_thread.h	(revision 238432)
+++ content/worker/worker_thread.h	(working copy)
@@ -39,8 +39,10 @@
  private:
   virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   void OnCreateWorker(const WorkerProcessMsg_CreateWorker_Params& params);
+  void OnShutdown();
 
   scoped_ptr<WorkerWebKitPlatformSupportImpl> webkit_platform_support_;
   scoped_ptr<AppCacheDispatcher> appcache_dispatcher_;