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

components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc

Index: components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc
diff --git a/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc b/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc
index 4ff1d4c076dcf71f5f7df6013fcc1c9452407843..3b3cf9d6790b2ec02198f8fabb34fc31d2b2c578 100644
--- a/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc
+++ b/components/nacl/loader/sandbox_linux/nacl_sandbox_linux.cc
@@ -185,16 +185,14 @@ void NaClSandbox::InitializeLayerTwoSandbox(bool uses_nonsfi_mode) {
   // 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() {