Sandbox: remove raw handles from SharedMemIPCServer::ServerControl

sandbox/win/src/ipc_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "sandbox/win/src/crosscall_client.h"
 #include "sandbox/win/src/crosscall_server.h"
 #include "sandbox/win/src/sharedmem_ipc_client.h"
 #include "sandbox/win/src/sharedmem_ipc_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 598 matching lines @@
   CrossCallReturn answer;
   HANDLE bar = HANDLE(191919);
   DWORD foo = 6767676;
   CrossCall(client, UnitTestIPCDispatcher::CALL_ONE_TAG, bar, foo, &answer);
   void* buff = client.GetBuffer();
   ASSERT_TRUE(NULL != buff);
 
   UnitTestIPCDispatcher dispatcher;
   // Since we are directly calling InvokeCallback, most of this structure
   // can be set to NULL.
-  sandbox::SharedMemIPCServer::ServerControl srv_control = {
-      NULL, NULL, kIPCChannelSize, NULL,
-      reinterpret_cast<char*>(client_control),
-      NULL, &dispatcher, {0} };
+  sandbox::SharedMemIPCServer::ServerControl srv_control = {};
+  srv_control.channel_size = kIPCChannelSize;
+  srv_control.shared_base = reinterpret_cast<char*>(client_control);
+  srv_control.dispatcher = &dispatcher;
 
   sandbox::CrossCallReturn call_return = {0};
   EXPECT_TRUE(SharedMemIPCServer::InvokeCallback(&srv_control, buff,
                                                  &call_return));
   EXPECT_EQ(SBOX_ALL_OK, call_return.call_outcome);
   EXPECT_TRUE(bar == call_return.extended[0].handle);
   EXPECT_EQ(foo, call_return.extended[1].unsigned_int);
 
   CloseChannelEvents(client_control);
   delete[] reinterpret_cast<char*>(client_control);
 }
 
 }  // namespace sandbox