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"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 32 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) {
+int64 g_startup_time;
+StartupType g_startup_type;
+
+void RecordStartupInfo(StartupType startup_type, const base::Time& start_time) {

[benwells, 2013/11/15 02:13:59]

What calls this?

[koz (OOO until 15th September), 2013/11/17 23:16:19]

Oops, it's meant to be called below when we set the next paint callback.

+  g_startup_time = start_time.ToInternalValue();
+  g_startup_type = startup_type;
+}
+
+void RecordFirstPaintTiming() {
+  base::Time start_time(base::Time::FromInternalValue(g_startup_type));
   base::TimeDelta elapsed = base::Time::Now() - start_time;
-  switch (startup_type) {
+  switch (g_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 37 matching lines @@
       break;
     case WARM_START:
       UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStart", elapsed);
       break;
     case WARM_START_FAST:
       UMA_HISTOGRAM_LONG_TIMES("Startup.ShowAppListWarmStartFast", elapsed);
       break;
   }
 
   Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->SetAppListNextPaintCallback(
-      base::Bind(RecordFirstPaintTiming, startup, start_time));
+      RecordFirstPaintTiming);
 }