Remove static initializer from AppListView::SetNextPaintCallback().

chrome/browser/ui/app_list/app_list_service.cc

 // Copyright 2013 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 "chrome/browser/ui/app_list/app_list_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"

[benwells, 2013/11/18 05:13:32]

Nit: are bind.h and callback.h still needed?

[koz (OOO until 15th September), 2013/11/18 06:31:07]

Done.

 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/process/process_info.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
@@ skipping 24 matching lines @@
 StartupType GetStartupType(const CommandLine& command_line) {
   // The presence of kOriginalProcessStartTime implies that another process
   // has sent us its command line to handle, ie: we are already running.
   if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) {
     return command_line.HasSwitch(switches::kFastStart) ?
         WARM_START_FAST : WARM_START;
   }
   return COLD_START;
 }
 
-void RecordFirstPaintTiming(StartupType startup_type,
-                            const base::Time& start_time) {
+// The time the process that caused the app list to be shown started. This isn't
+// necessarily the currently executing process as we may be processing a command
+// line given to a short-lived Chrome instance.
+int64 g_original_process_start_time;
+
+// The type of startup the the current app list show has gone through.
+StartupType g_app_show_startup_type;
+
+void RecordStartupInfo(StartupType startup_type, const base::Time& start_time) {
+  g_original_process_start_time = start_time.ToInternalValue();
+  g_app_show_startup_type = startup_type;
+}
+
+void RecordFirstPaintTiming() {
+  base::Time start_time(
+      base::Time::FromInternalValue(g_original_process_start_time));
   base::TimeDelta elapsed = base::Time::Now() - start_time;
-  switch (startup_type) {
+  switch (g_app_show_startup_type) {
     case COLD_START:
       UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintColdStart", elapsed);
       break;
     case WARM_START:
       UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintWarmStart", elapsed);
       break;
     case WARM_START_FAST:
       UMA_HISTOGRAM_LONG_TIMES("Startup.AppListFirstPaintWarmStartFast",
                                elapsed);
       break;
@@ skipping 36 matching lines @@
       UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListColdStart", elapsed);
       break;
     case WARM_START:
       UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStart", elapsed);
       break;
     case WARM_START_FAST:
       UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStartFast", elapsed);
       break;
   }
 
+  RecordStartupInfo(startup, start_time);
   Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->SetAppListNextPaintCallback(
-      base::Bind(RecordFirstPaintTiming, startup, start_time));
+      RecordFirstPaintTiming);
 }