Don't log to stderr when running layout tests in the content shell

content/shell/shell_main_delegate.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 "content/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
+#include "base/logging.h"
 #include "base/path_service.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/shell_browser_main.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_renderer_client.h"
+#include "content/shell/shell_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
 #if defined(OS_MACOSX)
 #include "content/shell/paths_mac.h"
 #endif  // OS_MACOSX
 
+namespace {
+
+void InitLogging() {
+  FilePath log_filename;
+  PathService::Get(base::DIR_EXE, &log_filename);
+  log_filename = log_filename.AppendASCII("content_shell.log");
+  logging::InitLogging(
+      log_filename.value().c_str(),
+      logging::LOG_ONLY_TO_FILE,
+      logging::LOCK_LOG_FILE,
+      logging::DELETE_OLD_LOG_FILE,
+      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
+  const bool kProcessId = true;

[jam, 2012/06/26 15:30:00]

nit: i find that naming booleans like this, instead of SetLogItems(true, true,
false, true) is basically a duplication of the documentation of SetLogItems. If
someone really cares  to know what the parameters do, they can easily look at
the header. but this is personal style, so up to you :)

+  const bool kThreadId = true;
+  const bool kTimestamp = true;
+  const bool kTickcount = true;
+  logging::SetLogItems(kProcessId, kThreadId, !kTimestamp, kTickcount);
+}
+
+}  // namespace
+
 ShellMainDelegate::ShellMainDelegate() {
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 #if defined(OS_ANDROID)
   NOTREACHED();
 #endif
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
+    InitLogging();
 #if defined(OS_MACOSX)
   OverrideFrameworkBundlePath();
 #endif
   content::SetContentClient(&content_client_);
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
 #if defined(OS_MACOSX)
   OverrideChildProcessPath();
@@ skipping 42 matching lines @@
 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new content::ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 content::ContentRendererClient*
     ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new content::ShellContentRendererClient);
   return renderer_client_.get();
 }