Enable UMA log uploads for cellular networks.

components/metrics/metrics_reporting_scheduler.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 "components/metrics/metrics_reporting_scheduler.h"
 
 #include "base/compiler_specific.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 20 matching lines @@
 // Sending in a burst is better on a mobile device, since keeping the radio on
 // is very expensive.
 const int kUnsentLogsIntervalSeconds = 3;
 #else
 const int kUnsentLogsIntervalSeconds = 15;
 #endif
 
 // Standard interval between log uploads, in seconds.
 #if defined(OS_ANDROID) || defined(OS_IOS)
 const int kStandardUploadIntervalSeconds = 5 * 60;  // Five minutes.
+const int kStandardUploadIntervalCellularSeconds = 15 * 60;  // Five minutes.
 #else
 const int kStandardUploadIntervalSeconds = 30 * 60;  // Thirty minutes.
 #endif
 
 // When uploading metrics to the server fails, we progressively wait longer and
 // longer before sending the next log. This backoff process helps reduce load
 // on a server that is having issues.
 // The following is the multiplier we use to expand that inter-log duration.
 const double kBackoffMultiplier = 1.1;
 
@@ skipping 136 matching lines @@
                          upload_interval_.InMicroseconds()));
 
   TimeDelta max_interval = kMaxBackoffMultiplier * GetStandardUploadInterval();
   if (upload_interval_ > max_interval || upload_interval_.InSeconds() < 0) {
     upload_interval_ = max_interval;
   }
 }
 
 base::TimeDelta MetricsReportingScheduler::GetStandardUploadInterval() {
 #if defined(OS_ANDROID)
-  return GetUploadIntervalFromExperiment();
+  if (IsCellularConnection())
+    return TimeDelta::FromSeconds(kStandardUploadIntervalCellularSeconds);
+  return TimeDelta::FromSeconds(kStandardUploadIntervalSeconds);

[Alexei Svitkine (slow), 2015/02/13 21:11:40]

Nit: This is the same return as a below. So you can make the ifdef just around
the if statement and its body and share the return line.

[gayane -on leave until 09-2017, 2015/02/13 22:23:13]

Done.

 #else
   return TimeDelta::FromSeconds(kStandardUploadIntervalSeconds);
 #endif
 }
 
+void MetricsReportingScheduler::SetNetworkMetricsProvider(
+    const metrics::NetworkMetricsProvider* network_metrics_provider) {
+  network_metrics_provider_= network_metrics_provider;
+}
+
+bool MetricsReportingScheduler::IsCellularConnection() {
+  SystemProfileProto::Network::ConnectionType connection_type =
+      network_metrics_provider_->GetConnectionType();

[Alexei Svitkine (slow), 2015/02/13 21:11:40]

Nit: Since the API allows network_metrics_provider_ to never be set, handle that
case in the code.

[gayane -on leave until 09-2017, 2015/02/13 22:23:13]

Done.

+
+  switch(connection_type) {

[Alexei Svitkine (slow), 2015/02/13 21:11:40]

Nit: space before (

[gayane -on leave until 09-2017, 2015/02/13 22:23:13]

Done.

+    case SystemProfileProto_Network_ConnectionType_CONNECTION_2G:
+    case SystemProfileProto_Network_ConnectionType_CONNECTION_3G:
+    case SystemProfileProto_Network_ConnectionType_CONNECTION_4G:
+      return true;
+    default:
+      return false;
+  }
+}
+
 }  // namespace metrics