Revert of Move components/startup_metric_utils/* to components/startup_metric_utils/browser/*.

components/startup_metric_utils/startup_metric_utils.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 "components/startup_metric_utils/browser/startup_metric_utils.h"
+#include "components/startup_metric_utils/startup_metric_utils.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/trace_event/trace_event.h"
 
@@ skipping 160 matching lines @@
     }                                                                      \
   }
 
 #define UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE(type, basename,       \
                                                          begin_time, end_time) \
   {                                                                            \
     UMA_HISTOGRAM_WITH_STARTUP_TEMPERATURE(type, basename,                     \
                                            end_time - begin_time)              \
     TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1(                                   \
         "startup", basename, 0,                                                \
-        StartupTimeToTimeTicks(begin_time).ToInternalValue(), "Temperature",  \
+        StartupTimeToTimeTicks(begin_time).ToInternalValue(), "Temperature",   \
         g_startup_temperature);                                                \
     TRACE_EVENT_ASYNC_END_WITH_TIMESTAMP1(                                     \
         "startup", basename, 0,                                                \
-        StartupTimeToTimeTicks(end_time).ToInternalValue(), "Temperature",    \
+        StartupTimeToTimeTicks(end_time).ToInternalValue(), "Temperature",     \
         g_startup_temperature);                                                \
   }
 
 // On Windows, records the number of hard-faults that have occurred in the
 // current chrome.exe process since it was started. This is a nop on other
 // platforms.
 // crbug.com/476923
 // TODO(chrisha): If this proves useful, use it to split startup stats in two.
 void RecordHardFaultHistogram(bool is_first_run) {
 #if defined(OS_WIN)
@@ skipping 298 matching lines @@
 
 base::Time MainEntryPointTime() {
   return g_main_entry_point_time.Get();
 }
 
 StartupTemperature GetStartupTemperature() {
   return g_startup_temperature;
 }
 
 }  // namespace startup_metric_utils