Re-land second sandbox round of changes...

sandbox/src/sharedmem_ipc_server.h

Index: sandbox/src/sharedmem_ipc_server.h
===================================================================
--- sandbox/src/sharedmem_ipc_server.h	(revision 41493)
+++ sandbox/src/sharedmem_ipc_server.h	(working copy)
@@ -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 @@
   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 @@
 
 }  // namespace sandbox
 
-#endif  // SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H__
+#endif  // SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H_