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 "components/variations/variations_associated_data.h"
+#include "net/base/network_change_notifier.h"
+
+namespace metrics {
+
+namespace {
+
+// 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;
+}

[Alexei Svitkine (slow), 2016/05/13 20:21:09]

Nit: Add // namespace

Also, an empty line above it.

[gayane -on leave until 09-2017, 2016/05/13 20:43:00]

Done.

+
+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 !defined(OS_ANDROID) && !defined(OS_IOS)
+  return false;
+#endif

[Alexei Svitkine (slow), 2016/05/13 20:21:09]

I think you need an #else here else compiler may warn about unreachable code.

However, maybe ifdef is not the right thing here.

Because iOS we still want the defaults to be different (we don't want to enable
this on iOS yet). So I suggest removing this ifdef and putting an ifdef around
lines 22 and 23 with a different values for non-Android.

[gayane -on leave until 09-2017, 2016/05/13 20:43:00]

Done.

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