Android: Fix default filename for kTraceStartup file

content/browser/browser_main_loop.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/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ skipping 52 matching lines @@
 #include "ui/base/clipboard/clipboard.h"
 
 #if defined(USE_AURA)
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/browser_startup_controller.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
+#include "content/browser/android/tracing_controller_android.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "content/browser/theme_helper_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
@@ skipping 163 matching lines @@
                                                   G_LOG_FLAG_FATAL |
                                                   G_LOG_LEVEL_ERROR |
                                                   G_LOG_LEVEL_CRITICAL |
                                                   G_LOG_LEVEL_WARNING),
                       GLibLogHandler,
                       NULL);
   }
 }
 #endif
 
+void OnStoppedStartupTracing(const base::FilePath& trace_file) {
+  LOG(INFO) << "Completed startup tracing to " << trace_file.value();

[piman, 2014/04/11 07:45:20]

Hmm, I'm getting presubmit issues in a patch that touches this file because of
this line.
Did this land ignoring presubmit checks?

See
http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...

+}
+
 }  // namespace
 
 // The currently-running BrowserMainLoop.  There can be one or zero.
 BrowserMainLoop* g_current_browser_main_loop = NULL;
 
 // This is just to be able to keep ShutdownThreadsAndCleanUp out of
 // the public interface of BrowserMainLoop.
 class BrowserShutdownImpl {
  public:
   static void ImmediateShutdownAndExitProcess() {
@@ skipping 822 matching lines @@
 
   base::FilePath trace_file = command_line.GetSwitchValuePath(
       switches::kTraceStartupFile);
   // trace_file = "none" means that startup events will show up for the next
   // begin/end tracing (via about:tracing or AutomationProxy::BeginTracing/
   // EndTracing, for example).
   if (trace_file == base::FilePath().AppendASCII("none"))
     return;
 
   if (trace_file.empty()) {
+#if defined(OS_ANDROID)
+    TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
+#else
     // Default to saving the startup trace into the current dir.
     trace_file = base::FilePath().AppendASCII("chrometrace.log");
+#endif
   }
 
   std::string delay_str = command_line.GetSwitchValueASCII(
       switches::kTraceStartupDuration);
   int delay_secs = 5;
   if (!delay_str.empty() && !base::StringToInt(delay_str, &delay_secs)) {
     DLOG(WARNING) << "Could not parse --" << switches::kTraceStartupDuration
         << "=" << delay_str << " defaulting to 5 (secs)";
     delay_secs = 5;
   }
 
   BrowserThread::PostDelayedTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowserMainLoop::EndStartupTracing,
                  base::Unretained(this), trace_file),
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
-      trace_file, TracingController::TracingFileResultCallback());
+      trace_file, base::Bind(&OnStoppedStartupTracing));
 }
 
 }  // namespace content