Non-SFI mode: Remove old Non-SFI code.

components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc

 // Copyright 2014 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 "components/nacl/loader/sandbox_linux/nacl_sandbox_linux.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
@@ skipping 167 matching lines @@
   // have a single thread running here.
   DCHECK(!layer_one_sealed_);
   CHECK(IsSingleThreaded());
   CheckForExpectedNumberOfOpenFds();
 
   RestrictAddressSpaceUsage();
 
   // Pass proc_fd_ ownership to the BPF sandbox, which guarantees it will
   // be closed. There is no point in keeping it around since the BPF policy
   // will prevent its usage.
-  if (uses_nonsfi_mode) {
-    layer_two_enabled_ = nacl::nonsfi::InitializeBPFSandbox(proc_fd_.Pass());
-    layer_two_is_nonsfi_ = true;
-  } else {
 #if defined(OS_NACL_NONSFI)
-    LOG(FATAL) << "nacl_helper_nonsfi can run only Non-SFI plugin.";
+  CHECK(uses_nonsfi_mode);
+  layer_two_enabled_ = nacl::nonsfi::InitializeBPFSandbox(proc_fd_.Pass());
+  layer_two_is_nonsfi_ = true;
 #else
-    layer_two_enabled_ = nacl::InitializeBPFSandbox(proc_fd_.Pass());
+  CHECK(!uses_nonsfi_mode);
+  layer_two_enabled_ = nacl::InitializeBPFSandbox(proc_fd_.Pass());
 #endif
-  }
 }
 
 void NaClSandbox::SealLayerOneSandbox() {
   if (proc_fd_.is_valid() && !layer_two_enabled_) {
     // If nothing prevents us, check that there is no superfluous directory
     // open.
     CHECK(!HasOpenDirectory());
   }
   proc_fd_.reset();
   layer_one_sealed_ = true;
@@ skipping 31 matching lines @@
     static const char kNoBpfMsg[] =
         "The seccomp-bpf sandbox is not engaged for NaCl:";
     if (can_be_no_sandbox)
       LOG(ERROR) << kNoBpfMsg << kItIsDangerousMsg;
     else
       LOG(FATAL) << kNoBpfMsg << kItIsNotAllowedMsg;
   }
 }
 
 }  // namespace nacl