metrics: Use absolute interval-based perf collection

chrome/browser/metrics/chromeos_metrics_provider.cc

 // Copyright 2014 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/chromeos_metrics_provider.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 
 #if defined(USE_X11)
 #include "ui/events/x/touch_factory_x11.h"
 #endif  // defined(USE_X11)
 
 using metrics::ChromeUserMetricsExtension;
-using metrics::PerfDataProto;
+using metrics::SampledProfile;
 using metrics::SystemProfileProto;
 typedef SystemProfileProto::Hardware::Bluetooth::PairedDevice PairedDevice;
 
 namespace {
 
 PairedDevice::Type AsBluetoothDeviceType(
     device::BluetoothDevice::DeviceType device_type) {
   switch (device_type) {
     case device::BluetoothDevice::DEVICE_UNKNOWN:
       return PairedDevice::DEVICE_UNKNOWN;
@@ skipping 127 matching lines @@
 
   count = pref->GetInteger(prefs::kStabilitySystemUncleanShutdownCount);
   if (count) {
     stability_proto->set_unclean_system_shutdown_count(count);
     pref->SetInteger(prefs::kStabilitySystemUncleanShutdownCount, 0);
   }
 }
 
 void ChromeOSMetricsProvider::ProvideGeneralMetrics(
     metrics::ChromeUserMetricsExtension* uma_proto) {
-  std::vector<PerfDataProto> perf_data;
-  if (perf_provider_.GetPerfData(&perf_data)) {
-    for (std::vector<PerfDataProto>::iterator iter = perf_data.begin();
-         iter != perf_data.end();
+  std::vector<SampledProfile> sampled_profiles;
+  if (perf_provider_.GetSampledProfiles(&sampled_profiles)) {
+    for (std::vector<SampledProfile>::iterator iter = sampled_profiles.begin();
+         iter != sampled_profiles.end();
          ++iter) {
-      uma_proto->add_perf_data()->Swap(&(*iter));
+      uma_proto->add_sampled_profile()->Swap(&(*iter));
     }
   }
 }
 
 void ChromeOSMetricsProvider::WriteBluetoothProto(
     metrics::SystemProfileProto* system_profile_proto) {
   metrics::SystemProfileProto::Hardware* hardware =
       system_profile_proto->mutable_hardware();
 
   // BluetoothAdapterFactory::GetAdapter is synchronous on Chrome OS; if that
@@ skipping 65 matching lines @@
     }
 
     system_profile_proto->set_multi_profile_user_count(user_count);
   }
 }
 
 void ChromeOSMetricsProvider::SetBluetoothAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   adapter_ = adapter;
 }