Fix ChromeOS-only static initializers from the last 5 months.

chrome/browser/metrics/perf/perf_provider_chromeos.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 "chrome/browser/metrics/perf/perf_provider_chromeos.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <map>
 #include <string>
@@ skipping 172 matching lines @@
     return cmds;
   }
 
   // Unknown CPUs
   cmds.push_back(WeightAndValue(1.0, kPerfRecordCyclesCmd));
   return cmds;
 }
 
 }  // namespace internal
 
+PerfProvider::CollectionParams::CollectionParams()
+    : CollectionParams(base::TimeDelta::FromSeconds(2),

[dhsharp, 2016/02/27 03:05:24]

Please at least restore the comments for what these values are.

[Lei Zhang, 2016/03/29 19:03:45]

Done.

+                       base::TimeDelta::FromHours(3),
+                       PerfProvider::CollectionParams::TriggerParams(
+                           10,
+                           base::TimeDelta::FromSeconds(5)),
+                       PerfProvider::CollectionParams::TriggerParams(
+                           10,
+                           base::TimeDelta::FromSeconds(10))) {
+}
+
 PerfProvider::CollectionParams::CollectionParams(
     base::TimeDelta collection_duration,
     base::TimeDelta periodic_interval,
     TriggerParams resume_from_suspend,
     TriggerParams restore_session)
     : collection_duration_(collection_duration.ToInternalValue()),
       periodic_interval_(periodic_interval.ToInternalValue()),
       resume_from_suspend_(resume_from_suspend),
       restore_session_(restore_session) {
 }
 
 PerfProvider::CollectionParams::TriggerParams::TriggerParams(
     int64_t sampling_factor,
     base::TimeDelta max_collection_delay)
     : sampling_factor_(sampling_factor),
       max_collection_delay_(max_collection_delay.ToInternalValue()) {}
 
-const PerfProvider::CollectionParams PerfProvider::kDefaultParameters(
-  /* collection_duration = */ base::TimeDelta::FromSeconds(2),
-  /* periodic_interval = */ base::TimeDelta::FromHours(3),
-  /* resume_from_suspend = */ PerfProvider::CollectionParams::TriggerParams(
-      /* sampling_factor = */ 10,
-      /* max_collection_delay = */ base::TimeDelta::FromSeconds(5)),
-  /* restore_session = */ PerfProvider::CollectionParams::TriggerParams(
-      /* sampling_factor = */ 10,
-      /* max_collection_delay = */ base::TimeDelta::FromSeconds(10)));
-
 PerfProvider::PerfProvider()
-    : collection_params_(kDefaultParameters),
-      login_observer_(this),
+    : login_observer_(this),
       next_profiling_interval_start_(base::TimeTicks::Now()),
       weak_factory_(this) {
 }
 
 PerfProvider::~PerfProvider() {
   chromeos::LoginState::Get()->RemoveObserver(&login_observer_);
 }
 
 void PerfProvider::Init() {
   CHECK(command_selector_.SetOdds(
@@ skipping 388 matching lines @@
   scoped_ptr<SampledProfile> sampled_profile(new SampledProfile);
   sampled_profile->set_trigger_event(SampledProfile::RESTORE_SESSION);
   sampled_profile->set_ms_after_restore(time_after_restore.InMilliseconds());
   sampled_profile->set_num_tabs_restored(num_tabs_restored);
 
   CollectIfNecessary(std::move(sampled_profile));
   last_session_restore_collection_time_ = base::TimeTicks::Now();
 }
 
 }  // namespace metrics