| Index: chrome/browser/metrics/chrome_metrics_service_client.h
|
| diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| index c2f1c6e8bb2635ac94eec52cdf81e7998415d383..766c9e1271424d379986095091114a3d043349f3 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.h
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| @@ -15,6 +15,7 @@
|
| #include "chrome/browser/metrics/metrics_memory_details.h"
|
| #include "chrome/browser/metrics/network_stats_uploader.h"
|
| #include "components/metrics/metrics_service_client.h"
|
| +#include "components/metrics/net/network_metrics_provider.h"
|
| #include "components/metrics/profiler/tracking_synchronizer_observer.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -63,7 +64,7 @@ class ChromeMetricsServiceClient
|
| bool GetBrand(std::string* brand_code) override;
|
| metrics::SystemProfileProto::Channel GetChannel() override;
|
| std::string GetVersionString() override;
|
| - void OnLogUploadComplete() override;
|
| + void OnLogUploadComplete(bool upload_succeeded) override;
|
| void StartGatheringMetrics(const base::Closure& done_callback) override;
|
| void CollectFinalMetrics(const base::Closure& done_callback) override;
|
| scoped_ptr<metrics::MetricsLogUploader> CreateUploader(
|
| @@ -138,6 +139,11 @@ class ChromeMetricsServiceClient
|
| // that has been registered with MetricsService. On other platforms, is NULL.
|
| ChromeOSMetricsProvider* chromeos_metrics_provider_;
|
|
|
| + // The network metrics provider that was registered with MetricsService.
|
| + // Stored for determining network connection type. Has the same lifetime as
|
| + // |metrics_service_|.
|
| + metrics::NetworkMetricsProvider* network_metrics_provider_;
|
| +
|
| NetworkStatsUploader network_stats_uploader_;
|
|
|
| // Saved callback received from CollectFinalMetrics().
|
| @@ -172,10 +178,6 @@ class ChromeMetricsServiceClient
|
| // MemoryDetails.
|
| MemoryGrowthTracker memory_growth_tracker_;
|
|
|
| - // Callback to determine whether or not a cellular network is currently being
|
| - // used.
|
| - base::Callback<void(bool*)> cellular_callback_;
|
| -
|
| base::WeakPtrFactory<ChromeMetricsServiceClient> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeMetricsServiceClient);
|
|
|