Porting refactoring changes:...

chrome/common/logging_chrome.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 
 #include <iostream>
 #include <fstream>
 
 #include "chrome/common/logging_chrome.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "base/sys_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/env_util.h"
 #include "chrome/common/env_vars.h"
 
 // When true, this means that error dialogs should not be shown.
 static bool dialogs_are_suppressed_ = false;
 
 // This should be true for exactly the period between the end of
 // InitChromeLogging() and the beginning of CleanupChromeLogging().
 static bool chrome_logging_initialized_ = false;
 
 // Assertion handler for logging errors that occur when dialogs are
@@ skipping 59 matching lines @@
                        logging::LOCK_LOG_FILE,
                        delete_old_log_file);
 
   // we want process and thread IDs because we have a lot of things running
   logging::SetLogItems(true, true, false, true);
 
   // We call running in unattended mode "headless", and allow
   // headless mode to be configured either by the Environment
   // Variable or by the Command Line Switch.  This is for
   // automated test purposes.
-  if (env_util::HasEnvironmentVariable(env_vars::kHeadless) ||
+  if (base::SysInfo::HasEnvironmentVariable(env_vars::kHeadless) ||
       command_line.HasSwitch(switches::kNoErrorDialogs))
     SuppressDialogs();
 
   std::wstring log_filter_prefix =
       command_line.GetSwitchValue(switches::kLogFilterPrefix);
   logging::SetLogFilterPrefix(WideToUTF8(log_filter_prefix).c_str());
 
   // Use a minimum log level if the command line has one, otherwise set the
   // default to LOG_WARNING.
   std::wstring log_level = command_line.GetSwitchValue(switches::kLoggingLevel);
@@ skipping 65 matching lines @@
       ++assertion_count;
     }
   }
   log_file.close();
 
   return assertion_count;
 }
 
 } // namespace logging