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

chrome/test/automation/proxy_launcher.cc

 // Copyright (c) 2012 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 "chrome/test/automation/proxy_launcher.h"
 
 #include <vector>
 
 #include "base/environment.h"
 #include "base/file_util.h"
@@ skipping 104 matching lines @@
 ProxyLauncher::ProxyLauncher()
     : process_(base::kNullProcessHandle),
       process_id_(-1),
       shutdown_type_(WINDOW_CLOSE),
       no_sandbox_(CommandLine::ForCurrentProcess()->HasSwitch(
                       switches::kNoSandbox)),
       full_memory_dump_(CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kFullMemoryCrashReport)),
       show_error_dialogs_(CommandLine::ForCurrentProcess()->HasSwitch(
                               switches::kEnableErrorDialogs)),
-      enable_dcheck_(CommandLine::ForCurrentProcess()->HasSwitch(
-                         switches::kEnableDCHECK)),
       silent_dump_on_dcheck_(CommandLine::ForCurrentProcess()->HasSwitch(
                                  switches::kSilentDumpOnDCHECK)),
       disable_breakpad_(CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kDisableBreakpad)),
       js_flags_(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                     switches::kJavaScriptFlags)),
       log_level_(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                      switches::kLoggingLevel)) {
 }
 
@@ skipping 284 matching lines @@
   if (include_testing_id)
     command_line->AppendSwitchASCII(switches::kTestingChannelID,
                                     PrefixedChannelID());
 
   if (!show_error_dialogs_)
     command_line->AppendSwitch(switches::kNoErrorDialogs);
   if (no_sandbox_)
     command_line->AppendSwitch(switches::kNoSandbox);
   if (full_memory_dump_)
     command_line->AppendSwitch(switches::kFullMemoryCrashReport);
-  if (enable_dcheck_)
-    command_line->AppendSwitch(switches::kEnableDCHECK);
   if (silent_dump_on_dcheck_)
     command_line->AppendSwitch(switches::kSilentDumpOnDCHECK);
   if (disable_breakpad_)
     command_line->AppendSwitch(switches::kDisableBreakpad);
 
   if (!js_flags_.empty())
     command_line->AppendSwitchASCII(switches::kJavaScriptFlags, js_flags_);
   if (!log_level_.empty())
     command_line->AppendSwitchASCII(switches::kLoggingLevel, log_level_);
 
@@ skipping 183 matching lines @@
   return LaunchBrowserAndServer(state, wait_for_initial_loads);
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }