| Index: chromecast/browser/metrics/cast_metrics_service_client.cc
|
| diff --git a/chromecast/browser/metrics/cast_metrics_service_client.cc b/chromecast/browser/metrics/cast_metrics_service_client.cc
|
| index beff0aea9def89e5bb496af339ec03c698ac8641..483cd1ed36cae9df2526a04d5ef94f90955fb20a 100644
|
| --- a/chromecast/browser/metrics/cast_metrics_service_client.cc
|
| +++ b/chromecast/browser/metrics/cast_metrics_service_client.cc
|
| @@ -232,9 +232,7 @@ void CastMetricsServiceClient::CollectFinalMetricsForLog(
|
| done_callback.Run();
|
| }
|
|
|
| -std::unique_ptr<::metrics::MetricsLogUploader>
|
| -CastMetricsServiceClient::CreateUploader(
|
| - const base::Callback<void(int)>& on_upload_complete) {
|
| +std::string CastMetricsServiceClient::GetMetricsServerUrl() {
|
| std::string uma_server_url(::metrics::kDefaultMetricsServerUrl);
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(switches::kOverrideMetricsUploadUrl)) {
|
| @@ -242,10 +240,17 @@ CastMetricsServiceClient::CreateUploader(
|
| command_line->GetSwitchValueASCII(switches::kOverrideMetricsUploadUrl));
|
| }
|
| DCHECK(!uma_server_url.empty());
|
| + return uma_server_url;
|
| +}
|
| +
|
| +std::unique_ptr<::metrics::MetricsLogUploader>
|
| +CastMetricsServiceClient::CreateUploader(
|
| + const std::string& server_url,
|
| + const std::string& mime_type,
|
| + const base::Callback<void(int)>& on_upload_complete) {
|
| return std::unique_ptr<::metrics::MetricsLogUploader>(
|
| - new ::metrics::NetMetricsLogUploader(request_context_, uma_server_url,
|
| - ::metrics::kDefaultMetricsMimeType,
|
| - on_upload_complete));
|
| + new ::metrics::NetMetricsLogUploader(request_context_, server_url,
|
| + mime_type, on_upload_complete));
|
| }
|
|
|
| base::TimeDelta CastMetricsServiceClient::GetStandardUploadInterval() {
|
|
|