Store unsaved trace data on exit.

content/browser/browser_main_runner.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/public/browser/browser_main_runner.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 112 matching lines @@
     DCHECK(initialization_started_);
     DCHECK(!is_shutdown_);
 #ifdef LEAK_SANITIZER
     // Invoke leak detection now, to avoid dealing with shutdown-only leaks.
     // Normally this will have already happened in
     // BroserProcessImpl::ReleaseModule(), so this call has no effect. This is
     // only for processes which do not instantiate a BrowserProcess.
     // If leaks are found, the process will exit here.
     __lsan_do_leak_check();
 #endif
+    // If startup tracing has not been finished yet, replace it's dumper.

[sky, 2014/06/26 16:39:27]

It's not clear to me why this is done. Update comment so it is clear.

[Alexander Alekseev, 2014/06/27 20:09:50]

Done.

+    scoped_ptr<BrowserShutdownProfileDumper> startup_profiler;
+    if (main_loop_->is_tracing_startup()) {
+      startup_profiler.reset(
+          new BrowserShutdownProfileDumper(main_loop_->startup_trace_file()));
+      main_loop_->StopStartupTracingTimer();
+    }
+
     // The shutdown tracing got enabled in AttemptUserExit earlier, but someone
     // needs to write the result to disc. For that a dumper needs to get created
     // which will dump the traces to disc when it gets destroyed.
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    scoped_ptr<BrowserShutdownProfileDumper> profiler;
-    if (command_line.HasSwitch(switches::kTraceShutdown))
-      profiler.reset(new BrowserShutdownProfileDumper());
+    scoped_ptr<BrowserShutdownProfileDumper> shutdown_profiler;
+    if (command_line.HasSwitch(switches::kTraceShutdown)) {
+      shutdown_profiler.reset(
+          new BrowserShutdownProfileDumper(GetShutdownProfileFileName()));
+    }
 
     {
       // The trace event has to stay between profiler creation and destruction.
       TRACE_EVENT0("shutdown", "BrowserMainRunner");
       g_exited_main_message_loop = true;
 
       main_loop_->ShutdownThreadsAndCleanUp();
 
       ui::ShutdownInputMethod();
   #if defined(OS_WIN)
       ole_initializer_.reset(NULL);
   #endif
   #if defined(OS_ANDROID)
       // Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring
       // proper shutdown for content_browsertests. Shutdown() is not used by
       // the actual browser.
       base::MessageLoop::current()->QuitNow();
   #endif
       main_loop_.reset(NULL);
 
       notification_service_.reset(NULL);
 
       is_shutdown_ = true;
     }
   }
 
  protected:
+  // Returns the file name where we should save the shutdown trace dump to.
+  static base::FilePath GetShutdownProfileFileName() {

[sky, 2014/06/26 16:39:27]

Move this to a common place so it isn't duplicated.

[Alexander Alekseev, 2014/06/27 20:09:49]

It's now a static method of BrowserShutdownProfileDumper .

+    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    base::FilePath trace_file =
+        command_line.GetSwitchValuePath(switches::kTraceShutdownFile);
+
+    if (!trace_file.empty())
+      return trace_file;
+
+    // Default to saving the startup trace into the current dir.
+    return base::FilePath().AppendASCII("chrometrace.log");
+  }
+
   // True if we have started to initialize the runner.
   bool initialization_started_;
 
   // True if the runner has been shut down.
   bool is_shutdown_;
 
   scoped_ptr<NotificationServiceImpl> notification_service_;
   scoped_ptr<BrowserMainLoop> main_loop_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content