Make the launch params the default client behavior for UMA 3g

components/metrics/net/cellular_logic_helper.cc

+// Copyright 2016 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/net/cellular_logic_helper.h"
+
+#include "base/metrics/field_trial.h"
+#include "components/variations/variations_associated_data.h"
+#include "net/base/network_change_notifier.h"
+
+namespace metrics {
+
+// 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;  // Fifteen minutes.
+#else
+const int kStandardUploadIntervalSeconds = 30 * 60;  // Thirty minutes.
+#endif
+
+const bool kDefaultCellularLogicEnabled = true;
+const bool kDefaultCellularLogicOptimization = true;
+
+base::TimeDelta GetUploadInterval() {
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  if (IsCellularLogicEnabled())
+    return base::TimeDelta::FromSeconds(kStandardUploadIntervalCellularSeconds);
+#endif
+  return base::TimeDelta::FromSeconds(kStandardUploadIntervalSeconds);
+}
+
+// Returns true if current connection type is cellular and user is assigned to
+// experimental group for enabled cellular uploads.
+bool IsCellularLogicEnabled() {
+  if (base::FieldTrialList::FindFullName("UMA_EnableCellularLogUpload").empty())
+    return false;

[Alexei Svitkine (slow), 2016/05/13 15:53:59]

I think we want to default to the new behavior when there's no field trial, so
remove this if/return please.

[gayane -on leave until 09-2017, 2016/05/13 18:33:15]

Done.

+
+  std::string enabled = variations::GetVariationParamValue(
+      "UMA_EnableCellularLogUpload", "Enabled");
+  std::string optimized = variations::GetVariationParamValue(
+      "UMA_EnableCellularLogUpload", "Optimize");
+  bool is_enabled;
+  if (enabled.empty())
+    is_enabled = kDefaultCellularLogicEnabled;
+  else
+    is_enabled = enabled == "true";
+
+  bool is_optimized;
+  if (optimized.empty())
+    is_optimized = kDefaultCellularLogicOptimization;
+  else
+    is_optimized = optimized == "true";
+
+  if (!is_enabled || !is_optimized)
+    return false;
+
+  return net::NetworkChangeNotifier::IsConnectionCellular(
+      net::NetworkChangeNotifier::GetConnectionType());
+}
+}

[Alexei Svitkine (slow), 2016/05/13 15:53:59]

Nit: Add // namespace metrics and an empty line above it.

[gayane -on leave until 09-2017, 2016/05/13 18:33:15]

Done.