[Merge M48] "[Merge M49] Add SameVersionStartupCounts suffix to startup HardFault and Temperature h…

components/html_viewer/stats_collection_controller.cc

 // Copyright 2015 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/html_viewer/stats_collection_controller.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 15 matching lines @@
     tracing::StartupPerformanceTimesPtr times) {
   base::StatisticsRecorder::Initialize();
 
   startup_metric_utils::RecordStartupProcessCreationTime(
       base::Time::FromInternalValue(times->shell_process_creation_time));
 
   // TODO(msw): Record the MojoMain() entry point time of mojo:browser instead?
   startup_metric_utils::RecordMainEntryPointTime(
       base::Time::FromInternalValue(times->shell_main_entry_point_time));
 
-  // TODO(msw): Determine if this is the first run.
+  // TODO(msw): Determine if this is the first run and provide a PrefService
+  // to generate stats that span multiple startups.
   startup_metric_utils::RecordBrowserMainMessageLoopStart(
       base::TimeTicks::FromInternalValue(
           times->browser_message_loop_start_ticks),
-      false);
+      false, nullptr);
 
   startup_metric_utils::RecordBrowserWindowDisplay(
       base::TimeTicks::FromInternalValue(times->browser_window_display_ticks));
 
   startup_metric_utils::RecordBrowserOpenTabsDelta(
       base::TimeDelta::FromInternalValue(times->browser_open_tabs_time_delta));
 
   startup_metric_utils::RecordFirstWebContentsMainFrameLoad(
       base::TimeTicks::FromInternalValue(
           times->first_web_contents_main_frame_load_ticks));
@@ skipping 102 matching lines @@
     histogram->WriteJSON(&histogram_json);
   return histogram_json;
 }
 
 std::string StatsCollectionController::GetBrowserHistogram(
     const std::string& histogram_name) {
   return GetHistogram(histogram_name);
 }
 
 }  // namespace html_viewer