| 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..4feb582129b0dea72af477e695196abb43efea08 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
| @@ -30,6 +30,7 @@
|
| #include "chrome/common/crash_keys.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/render_messages.h"
|
| +#include "components/metrics/call_stack_profile_metrics_provider.h"
|
| #include "components/metrics/gpu/gpu_metrics_provider.h"
|
| #include "components/metrics/metrics_service.h"
|
| #include "components/metrics/net/net_metrics_log_uploader.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)
|
| + 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 metrics::CallStackProfileMetricsProvider));
|
| +
|
| #if defined(OS_ANDROID)
|
| metrics_service_->RegisterMetricsProvider(
|
| scoped_ptr<metrics::MetricsProvider>(
|
|
|