1 files changed, 21 insertions, 1 deletions
diff --git a/chromium/components/nacl/loader/nacl_main_platform_delegate_linux.cc b/chromium/components/nacl/loader/nacl_main_platform_delegate_linux.cc
index cbe886bc006..e9d2f731787 100644
--- a/chromium/components/nacl/loader/nacl_main_platform_delegate_linux.cc
+++ b/chromium/components/nacl/loader/nacl_main_platform_delegate_linux.cc
@@ -4,14 +4,28 @@
 
 #include "components/nacl/loader/nacl_main_platform_delegate.h"
 
+#include "base/command_line.h"
+
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
-    : parameters_(parameters) {
+    : parameters_(parameters), sandbox_test_module_(NULL) {
 }
 
 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
 }
 
+void NaClMainPlatformDelegate::PlatformInitialize() {
+}
+
+void NaClMainPlatformDelegate::PlatformUninitialize() {
+}
+
+void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
+  // The sandbox is started in the zygote process: zygote_main_linux.cc
+  // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
+  return;
+}
+
 void NaClMainPlatformDelegate::EnableSandbox() {
   // The setuid sandbox is started in the zygote process: zygote_main_linux.cc
   // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
@@ -29,3 +43,9 @@ void NaClMainPlatformDelegate::EnableSandbox() {
   // At best, NaCl will not work.  At worst, enabling the seccomp sandbox
   // could create a hole in the NaCl sandbox.
 }
+
+bool NaClMainPlatformDelegate::RunSandboxTests() {
+  // The sandbox is started in the zygote process: zygote_main_linux.cc
+  // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
+  return true;
+}