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

chrome/browser/metrics/perf/perf_provider_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_METRICS_PERF_PERF_PROVIDER_CHROMEOS_H_
 #define CHROME_BROWSER_METRICS_PERF_PERF_PROVIDER_CHROMEOS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 43 matching lines @@
       void set_sampling_factor(int64_t factor) { sampling_factor_ = factor; }
 
       base::TimeDelta max_collection_delay() const {
         return base::TimeDelta::FromInternalValue(max_collection_delay_);
       }
       void set_max_collection_delay(base::TimeDelta delay) {
         max_collection_delay_ = delay.ToInternalValue();
       }
 
      private:
-      TriggerParams() = default;  // POD
+      TriggerParams() = delete;
 
       // Limit the number of profiles collected.
       int64_t sampling_factor_;
 
       // Add a random delay before collecting after the trigger.
       // The delay should be randomly selected between 0 and this value.
       TimeDeltaInternalType max_collection_delay_;
     };
 
+    CollectionParams();
+
     CollectionParams(base::TimeDelta collection_duration,
                      base::TimeDelta periodic_interval,
                      TriggerParams resume_from_suspend,
                      TriggerParams restore_session);
 
     base::TimeDelta collection_duration() const {
       return base::TimeDelta::FromInternalValue(collection_duration_);
     }
     void set_collection_duration(base::TimeDelta duration) {
       collection_duration_ = duration.ToInternalValue();
@@ skipping 13 matching lines @@
       return &resume_from_suspend_;
     }
     const TriggerParams& restore_session() const {
       return restore_session_;
     }
     TriggerParams* mutable_restore_session() {
       return &restore_session_;
     }
 
    private:
-    CollectionParams() = default;  // POD
-
     // Time perf is run for.
     TimeDeltaInternalType collection_duration_;
 
     // For PERIODIC_COLLECTION, partition time since login into successive
     // intervals of this duration. In each interval, a random time is picked to
     // collect a profile.
     TimeDeltaInternalType periodic_interval_;
 
     // Parameters for RESUME_FROM_SUSPEND and RESTORE_SESSION collections:
     TriggerParams resume_from_suspend_;
     TriggerParams restore_session_;
+
+    DISALLOW_COPY_AND_ASSIGN(CollectionParams);
   };
 
   // Parses a PerfDataProto from serialized data |perf_data|, if it exists.
   // Parses a PerfStatProto from serialized data |perf_stat|, if it exists.
   // Only one of these may contain data. If both |perf_data| and |perf_stat|
   // contain data, it is counted as an error and neither is parsed.
   // |incognito_observer| indicates whether an incognito window had been opened
   // during the profile collection period. If there was an incognito window,
   // discard the incoming data.
   // |trigger_event| is the cause of the perf data collection.
@@ skipping 18 matching lines @@
   }
   const RandomSelector& command_selector() const {
     return command_selector_;
   }
 
   const base::OneShotTimer& timer() const {
     return timer_;
   }
 
  private:
-  static const CollectionParams kDefaultParameters;
-
   // Class that listens for changes to the login state. When a normal user logs
   // in, it updates PerfProvider to start collecting data.
   class LoginObserver : public chromeos::LoginState::Observer {
    public:
     explicit LoginObserver(PerfProvider* perf_provider);
 
     // Called when either the login state or the logged in user type changes.
     // Activates |perf_provider_| to start collecting.
     void LoggedInStateChanged() override;
 
@@ skipping 96 matching lines @@
 // (currently only Intel uarchs supported), or a CPU model name substring.
 std::string FindBestCpuSpecifierFromParams(
     const std::map<std::string, std::string>& params,
     const CPUIdentity& cpuid);
 
 }  // namespace internal
 
 }  // namespace metrics
 
 #endif  // CHROME_BROWSER_METRICS_PERF_PERF_PROVIDER_CHROMEOS_H_