| Index: content/browser/renderer_host/sandbox_ipc_linux.h
|
| diff --git a/content/browser/renderer_host/sandbox_ipc_linux.h b/content/browser/renderer_host/sandbox_ipc_linux.h
|
| index e9009546dea32e8d40ea9218d19f95150457b123..86c2756c4b9ac622d609e0c30b0237d626e19ae2 100644
|
| --- a/content/browser/renderer_host/sandbox_ipc_linux.h
|
| +++ b/content/browser/renderer_host/sandbox_ipc_linux.h
|
| @@ -12,26 +12,21 @@
|
| #include "base/files/scoped_file.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/pickle.h"
|
| +#include "base/threading/simple_thread.h"
|
| #include "content/child/blink_platform_impl.h"
|
| #include "skia/ext/skia_utils_base.h"
|
|
|
| namespace content {
|
|
|
| -class SandboxIPCProcess {
|
| +class SandboxIPCHandler : public base::DelegateSimpleThread::Delegate {
|
| public:
|
| - // lifeline_fd: this is the read end of a pipe which the browser process
|
| - // holds the other end of. If the browser process dies, its descriptors are
|
| - // closed and we will noticed an EOF on the pipe. That's our signal to exit.
|
| - // browser_socket: the browser's end of the sandbox IPC socketpair. From the
|
| - // point of view of the renderer, it's talking to the browser but this
|
| - // object actually services the requests.
|
| + // browser_socket: the browser's end of the sandbox IPC socketpair.
|
| // sandbox_cmd: the path of the sandbox executable.
|
| - SandboxIPCProcess(int lifeline_fd,
|
| - int browser_socket,
|
| + SandboxIPCHandler(int browser_socket,
|
| std::string sandbox_cmd);
|
| - ~SandboxIPCProcess();
|
| + virtual ~SandboxIPCHandler();
|
|
|
| - void Run();
|
| + virtual void Run() OVERRIDE;
|
|
|
| private:
|
| void EnsureWebKitInitialized();
|
| @@ -84,13 +79,12 @@ class SandboxIPCProcess {
|
| const Pickle& reply,
|
| int reply_fd);
|
|
|
| - const int lifeline_fd_;
|
| const int browser_socket_;
|
| std::vector<std::string> sandbox_cmd_;
|
| scoped_ptr<BlinkPlatformImpl> webkit_platform_support_;
|
| SkTDArray<SkString*> paths_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(SandboxIPCProcess);
|
| + DISALLOW_COPY_AND_ASSIGN(SandboxIPCHandler);
|
| };
|
|
|
| } // namespace content
|
|
|