Let DCHECK in non-official-release build be opt-in with dcheck_always_on=1 only

components/nacl/common/nacl_cmd_line.cc

 // Copyright 2013 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 "base/base_switches.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/common/content_switches.h"
 
 namespace nacl {
 
 void CopyNaClCommandLineArguments(CommandLine* cmd_line) {
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
 
   // Propagate the following switches to the NaCl loader command line (along
   // with any associated values) if present in the browser command line.
   // TODO(gregoryd): check which flags of those below can be supported.
   static const char* const kSwitchNames[] = {
     switches::kNoSandbox,
     switches::kDisableBreakpad,
     switches::kFullMemoryCrashReport,
     switches::kEnableLogging,
     switches::kDisableLogging,
+    switches::kNoErrorDialogs,

[Nico, 2014/03/08 00:11:06]

alphabetize (i.e. put it back in the same place where you deleted it :-) )

[Xianzhu, 2014/03/08 00:16:41]

Done. (Sorry again for the carelessness)

     switches::kLoggingLevel,
-    switches::kEnableDCHECK,
-    switches::kNoErrorDialogs,
 #if defined(OS_MACOSX)
     switches::kEnableSandboxLogging,
 #endif
   };
   cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                              arraysize(kSwitchNames));
 }
 
 }  // namespace nacl