Index: chrome/browser/metrics/chrome_metrics_service_client.cc |
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc |
index 8954197117c9b35a4d1ba0d4a5d44bf6d59bf963..9d7e35f3aacd1a9c25d32528a0be4f4566defda9 100644 |
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc |
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc |
@@ -21,6 +21,7 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/google/google_brand.h" |
+#include "chrome/browser/metrics/call_stack_profile_metrics_provider.h" |
#include "chrome/browser/metrics/chrome_stability_metrics_provider.h" |
#include "chrome/browser/metrics/omnibox_metrics_provider.h" |
#include "chrome/browser/ui/browser_otr_state.h" |
@@ -103,9 +104,16 @@ metrics::SystemProfileProto::Channel AsProtobufChannel( |
ChromeMetricsServiceClient::ChromeMetricsServiceClient( |
metrics::MetricsStateManager* state_manager) |
: metrics_state_manager_(state_manager), |
- chromeos_metrics_provider_(NULL), |
+ chromeos_metrics_provider_(nullptr), |
waiting_for_collect_final_metrics_step_(false), |
num_async_histogram_fetches_in_progress_(0), |
+ profiler_metrics_provider_(nullptr), |
+#if defined(ENABLE_PLUGINS) |
Alexei Svitkine (slow)
2015/03/17 23:10:10
FYI: If https://codereview.chromium.org/999623002/
Mike Wittman
2015/03/18 01:48:36
Thanks for the heads up.
|
+ plugin_metrics_provider_(nullptr), |
+#endif |
+#if defined(OS_WIN) |
+ google_update_metrics_provider_(nullptr), |
+#endif |
weak_ptr_factory_(this) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
RecordCommandLineMetrics(); |
@@ -293,6 +301,10 @@ void ChromeMetricsServiceClient::Initialize() { |
metrics_service_->RegisterMetricsProvider( |
scoped_ptr<metrics::MetricsProvider>(profiler_metrics_provider_)); |
+ metrics_service_->RegisterMetricsProvider( |
+ scoped_ptr<metrics::MetricsProvider>( |
+ new CallStackProfileMetricsProvider)); |
+ |
#if defined(OS_ANDROID) |
metrics_service_->RegisterMetricsProvider( |
scoped_ptr<metrics::MetricsProvider>( |