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

tools/android/forwarder2/daemon.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 "tools/android/forwarder2/daemon.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/file.h>
@@ skipping 28 matching lines @@
 const int kNumTries = 100;
 const int kIdleTimeMSec = 20;
 
 void InitLoggingForDaemon(const std::string& log_file) {
   logging::LoggingSettings settings;
   settings.logging_dest =
       log_file.empty() ?
       logging::LOG_TO_SYSTEM_DEBUG_LOG : logging::LOG_TO_FILE;
   settings.log_file = log_file.c_str();
   settings.lock_log = logging::DONT_LOCK_LOG_FILE;
-  settings.dcheck_state =
-      logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
   CHECK(logging::InitLogging(settings));
 }
 
 bool RunServerAcceptLoop(const std::string& welcome_message,
                          Socket* server_socket,
                          Daemon::ServerDelegate* server_delegate) {
   bool failed = false;
   for (;;) {
     scoped_ptr<Socket> client_socket(new Socket());
     if (!server_socket->Accept(client_socket.get())) {
@@ skipping 222 matching lines @@
       return true;
     }
     usleep(kIdleTimeMSec * 1000);
   }
   LOG(ERROR) << "Timed out while killing daemon. "
                 "It might still be tearing down.";
   return false;
 }
 
 }  // namespace forwarder2