Display content_shell error messages.

content/shell/app/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/app/shell_main_delegate.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
-#include "base/logging.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
 #include "content/common/content_constants_internal.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/public/test/layouttest_support.h"
 #include "content/public/test/ppapi_test_utils.h"
 #include "content/shell/app/blink_test_platform_support.h"
 #include "content/shell/app/shell_crash_reporter_client.h"
 #include "content/shell/browser/layout_test/layout_test_browser_main.h"
 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h"
 #include "content/shell/browser/shell_browser_main.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/common/layout_test/layout_test_content_client.h"
 #include "content/shell/common/layout_test/layout_test_switches.h"
 #include "content/shell/common/shell_content_client.h"
-#include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 #include "content/shell/renderer/shell_content_renderer_client.h"
 #include "content/shell/utility/shell_content_utility_client.h"
 #include "media/base/media_switches.h"
 #include "media/base/mime_util.h"
 #include "net/cookies/cookie_monster.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display_switches.h"
@@ skipping 50 matching lines @@
 //    "default_flags"=dword:00000001
 //    "default_level"=dword:00000004
 //    @="Content Shell"
 
 // {6A3E50A4-7E15-4099-8413-EC94D8C2A4B6}
 const GUID kContentShellProviderName = {
     0x6a3e50a4, 0x7e15, 0x4099,
         { 0x84, 0x13, 0xec, 0x94, 0xd8, 0xc2, 0xa4, 0xb6 } };
 #endif
 
-void InitLogging() {
-  base::FilePath log_filename;
-  PathService::Get(base::DIR_EXE, &log_filename);
-  log_filename = log_filename.AppendASCII("content_shell.log");
-  logging::LoggingSettings settings;
-  settings.logging_dest = logging::LOG_TO_ALL;
-  settings.log_file = log_filename.value().c_str();
-  settings.delete_old = logging::DELETE_OLD_LOG_FILE;
-  logging::InitLogging(settings);
-  logging::SetLogItems(true, true, true, true);
-}
-
 }  // namespace
 
 namespace content {
 
 ShellMainDelegate::ShellMainDelegate() {
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 }
 
@@ skipping 10 matching lines @@
   v8_breakpad_support::SetUp();
 #endif
 #if defined(OS_MACOSX)
   // Needs to happen before InitializeResourceBundle() and before
   // BlinkTestPlatformInitialize() are called.
   OverrideFrameworkBundlePath();
   OverrideChildProcessPath();
   EnsureCorrectResolutionSettings();
 #endif  // OS_MACOSX
 
-  InitLogging();

[Dirk Pranke, 2016/11/29 02:20:48]

You should probably leave the logging code in and have:

if (!command_line.HasSwitch(switches::kRunLayoutTest))
  InitLogging();

So that we still get content_shell.log in the normal case.

[Jack Bates, 2016/12/01 17:47:38]

Done.

   if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) {
     // If CheckLayoutSystemDeps succeeds, we don't exit early. Instead we
     // continue and try to load the fonts in BlinkTestPlatformInitialize
     // below, and then try to bring up the rest of the content module.
     if (!CheckLayoutSystemDeps()) {
       *exit_code = 1;
       return true;
     }
   }
 
@@ skipping 210 matching lines @@
 
   return renderer_client_.get();
 }
 
 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
   utility_client_.reset(new ShellContentUtilityClient);
   return utility_client_.get();
 }
 
 }  // namespace content