diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-13 02:22:32 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-13 02:22:32 +0000 |
| commit | 0d6cf24f8f5fc56e1205591be16445b99328b55b (patch) | |
| tree | 3c6fcc03389e4a4075b63dd04c72cfdabb8c5ae3 /sandbox/src/sharedmem_ipc_server.h | |
| parent | 6afb7ba3aedafb79c1b28bc29c2123b06015596a (diff) | |
| download | chromium_src-0d6cf24f8f5fc56e1205591be16445b99328b55b.zip chromium_src-0d6cf24f8f5fc56e1205591be16445b99328b55b.tar.gz chromium_src-0d6cf24f8f5fc56e1205591be16445b99328b55b.tar.bz2 | |
Re-land second sandbox round of changes
- broke integration tests
See http://codereview.chromium.org/757001
BUG=27218
TEST=included
No change in the original files.
The only changes are in the files:
sandbox/src/registry_dispatcher.cc
sandbox/src/registry_dispatcher.h
sandbox/src/filesystem_dispatcher.cc
Because now even in 32 bits the handles map to void pointers
Review URL: http://codereview.chromium.org/873006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/sharedmem_ipc_server.h')
| -rw-r--r-- | sandbox/src/sharedmem_ipc_server.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sandbox/src/sharedmem_ipc_server.h b/sandbox/src/sharedmem_ipc_server.h index 337a221..1041245 100644 --- a/sandbox/src/sharedmem_ipc_server.h +++ b/sandbox/src/sharedmem_ipc_server.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2010 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 SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H__ -#define SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H__ +#ifndef SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H_ +#define SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H_ #include <list> @@ -12,6 +12,8 @@ #include "sandbox/src/crosscall_server.h" #include "sandbox/src/sharedmem_ipc_client.h" +#include "testing/gtest/include/gtest/gtest_prod.h" + // IPC transport implementation that uses shared memory. // This is the server side // @@ -51,6 +53,7 @@ class SharedMemIPCServer { bool Init(void* shared_mem, size_t shared_size, size_t channel_size); private: + FRIEND_TEST(IPCTest, SharedMemServerTests); // When an event fires (IPC request). A thread from the ThreadProvider // will call this function. The context parameter should be the same as // provided when ThreadProvider::RegisterWait was called. @@ -120,4 +123,4 @@ class SharedMemIPCServer { } // namespace sandbox -#endif // SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H__ +#endif // SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H_ |