Non-SFI mode: Remove kUseNaClHelperNonSfi command line flag.

components/nacl/common/nacl_paths.cc

Index: components/nacl/common/nacl_paths.cc
diff --git a/components/nacl/common/nacl_paths.cc b/components/nacl/common/nacl_paths.cc
index f7093800bc1f032cc81bd0937a4ca6ab53d471cf..6d486b01a20bacf74f883cc667625cac3db42f95 100644
--- a/components/nacl/common/nacl_paths.cc
+++ b/components/nacl/common/nacl_paths.cc
@@ -40,15 +40,6 @@ bool PathProvider(int key, base::FilePath* result) {
     case FILE_NACL_HELPER:
       return GetNaClHelperPath(kInternalNaClHelperFileName, result);
     case FILE_NACL_HELPER_NONSFI:
-      if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-              switches::kUseNaClHelperNonSfi) == "false") {
-        // nacl_helper_nonsfi is disabled by the flag. So, use nacl_helper
-        // in Non-SFI mode instead. This is old behavior just in case.
-        // TODO(hidehiko): Remove this code path, when the old feature is
-        // cleaned after nacl_helper_nonsfi is officially launched and
-        // its stability is confirmed.
-        return GetNaClHelperPath(kInternalNaClHelperFileName, result);
-      }
       return GetNaClHelperPath(kInternalNaClHelperNonSfiFileName, result);
     case FILE_NACL_HELPER_BOOTSTRAP:
       return GetNaClHelperPath(kInternalNaClHelperBootstrapFileName, result);