Implement GetSandboxType() on all platforms and implement for all process types.

content/public/common/sandboxed_process_launcher_delegate.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_SANDBOXED_PROCESS_LAUNCHER_DELEGATE_H_
 #define CONTENT_PUBLIC_COMMON_SANDBOXED_PROCESS_LAUNCHER_DELEGATE_H_
 
 #include "base/environment.h"
 #include "base/files/scoped_file.h"
 #include "base/process/process.h"
 #include "content/common/content_export.h"
-
-#if defined(OS_MACOSX)
-#include "content/public/common/sandbox_type_mac.h"
-#endif
+#include "content/public/common/sandbox_type.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace sandbox {
 class TargetPolicy;
 }
 
 namespace content {
@@ skipping 33 matching lines @@
 #elif defined(OS_POSIX)
   // Override this to return true to use the setuid sandbox.
   virtual bool ShouldUseZygote();
 
   // Override this if the process needs a non-empty environment map.
   virtual base::EnvironmentMap GetEnvironment();
 
   // Return the file descriptor for the IPC channel.
   virtual base::ScopedFD TakeIpcFd() = 0;
 
-#if defined(OS_MACOSX)
-  // Gets the Mac SandboxType to enforce on the process. Return
-  // SANDBOX_TYPE_INVALID for no sandbox policy.
+#endif

[nasko, 2015/06/19 12:18:19]

nit: empty line after the #endif, before the comment.

[Will Harris, 2015/06/23 16:21:11]

Done, but looks weird now, I couldn't find the standard on what I was supposed
to do here, almost looks like there is too much whitespace now.

+  // Gets the SandboxType to enforce on the process. Return SANDBOX_TYPE_INVALID

[nasko, 2015/06/19 12:18:20]

nit: Returns

[Will Harris, 2015/06/23 16:21:11]

Done.

[nasko, 2015/06/24 08:04:08]

I don't see the changes in this file from the previous patchset to the current
one. Did you accidentally forget to include them in the upload?

[Will Harris, 2015/06/24 11:37:09]

Sorry, I was going to upload them with the same PS as the restructured
GetAppContainerSid code. Now uploaded!

+  // for no sandbox policy.
   virtual SandboxType GetSandboxType();
-#endif
-
-#endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SANDBOXED_PROCESS_LAUNCHER_DELEGATE_H_