Use a struct instead of a union for SandboxInterfaceInfo...

chrome/common/sandbox_init_wrapper_win.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/sandbox_init_wrapper.h"
 
 #include "base/command_line.h"
+#include "base/logging.h"
+
 #include "chrome/common/chrome_switches.h"
 
 void SandboxInitWrapper::SetServices(sandbox::SandboxInterfaceInfo* info) {
   if (info) {
     broker_services_ = info->broker_services;
     target_services_ = info->target_services;
   }
+  // Both interface pointers cannot be non-zero. A process can either
+  // be a target or a broker both not both.
+  DCHECK(!(target_services_ && broker_services_));
 }
 
 bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
                                            const std::string& process_type) {
   if (command_line.HasSwitch(switches::kNoSandbox))
     return true;
   if ((process_type == switches::kRendererProcess) ||
       (process_type == switches::kExtensionProcess) ||
       (process_type == switches::kWorkerProcess) ||
       (process_type == switches::kNaClLoaderProcess) ||
       (process_type == switches::kUtilityProcess) ||
-      (process_type == switches::kPluginProcess &&
-       command_line.HasSwitch(switches::kSafePlugins))) {
-    if (!target_services_)
-      return false;
-    target_services_->Init();
+      (process_type == switches::kPluginProcess)) {
+    if (target_services_)
+      return (sandbox::SBOX_ALL_OK == target_services_->Init());

[rvargas (doing something else), 2011/02/10 00:23:43]

Are you counting on other parts of the code to properly set the right interface
for a renderer?. I mean, the previous code was failing if a renderer din't have
taget_services, but this code just returns true in that case.

If we believe this is correct, then we might as well remove all the checks here,
right?

[cpu_(ooo_6.6-7.5), 2011/02/10 18:50:51]

InitializeSandbox() is called regardless of what process starts. So
target_services_ can be null,  It is the if in line 26-31 that today saves the
bacon, in the sense that the caller does a CHECK() against the result of this
call. 

I think what this function does in mac and linux makes more sense than the
windows one.

I agree that we want to get to the point when this kind of tests of process_type
are not necessary but the code is convoluted so I think we want to take it one
step at a time.

   }
   return true;
 }