Enable UMA log uploads for cellular networks.

components/metrics/metrics_reporting_scheduler.h

 // 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.
 
 #ifndef COMPONENTS_METRICS_METRICS_REPORTING_SCHEDULER_H_
 #define COMPONENTS_METRICS_METRICS_REPORTING_SCHEDULER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "components/metrics/net/network_metrics_provider.h"

[Alexei Svitkine (slow), 2015/02/13 22:39:50]

Hmm, I just realised this is problematic.


The NetworkMetricsProvider is in metrics/net, which depends on the network
stack.

We don't want the normal MetricsService/MetricsReportingScheduler code to have
such a dependency.

So, instead of passing that object to this class, I suggest passing a callback
that can be bound to the function we want to use.

[gayane -on leave until 09-2017, 2015/02/17 19:38:02]

Done.

 
 namespace metrics {
 
 // Scheduler task to drive a MetricsService object's uploading.
 class MetricsReportingScheduler {
  public:
   explicit MetricsReportingScheduler(const base::Closure& upload_callback);
   ~MetricsReportingScheduler();
 
   // Starts scheduling uploads. This in a no-op if the scheduler is already
   // running, so it is safe to call more than once.
   void Start();
 
   // Stops scheduling uploads.
   void Stop();
 
   // Callback from MetricsService when the startup init task has completed.
   void InitTaskComplete();
 
   // Callback from MetricsService when a triggered upload finishes.
   void UploadFinished(bool server_is_healthy, bool more_logs_remaining);
 
   // Callback from MetricsService when a triggered upload is cancelled by the
   // MetricsService.
   void UploadCancelled();
 
   // Sets the upload interval to a specific value, exposed for unit tests.
   void SetUploadIntervalForTesting(base::TimeDelta interval);
 
+  // Sets class variable |network_metrics_provider| for having access to
+  // connection type.
+  void SetNetworkMetricsProvider(
+      const metrics::NetworkMetricsProvider* network_metrics_provider);

[Alexei Svitkine (slow), 2015/02/13 22:39:50]

No metrics:: prefix needed.

[gayane -on leave until 09-2017, 2015/02/17 19:38:02]

removed

+
+  // Returns true if the connection type is 2G, 3G, or 4G.
+  bool IsCellularConnection();
+
  private:
   // Timer callback indicating it's time for the MetricsService to upload
   // metrics.
   void TriggerUpload();
 
   // Schedules a future call to TriggerUpload if one isn't already pending.
   void ScheduleNextUpload();
 
   // Increases the upload interval each time it's called, to handle the case
   // where the server is having issues.
   void BackOffUploadInterval();
 
   // Returns upload interval based on the system and experiment that the user is
   // assigned to.
   // TODO(gayane): Only for experimenting with upload interval for Android
   // (bug: 17391128). Should be removed once the experiments are done.
   base::TimeDelta GetStandardUploadInterval();
 
+  // Returns true if the user is assigned to the experiment group for enabled
+  // cellular uploads.
+  bool IsCellularEnabledByExperiment()
+
   // The MetricsService method to call when uploading should happen.
   const base::Closure upload_callback_;
 
   base::OneShotTimer<MetricsReportingScheduler> upload_timer_;
 
   // The interval between being told an upload is done and starting the next
   // upload.
   base::TimeDelta upload_interval_;
 
   // The tick count of the last time log upload has been finished and null if no
   // upload has been done yet.
   base::TimeTicks last_upload_finish_time_;
 
   // Indicates that the scheduler is running (i.e., that Start has been called
   // more recently than Stop).
   bool running_;
 
   // Indicates that the last triggered upload hasn't resolved yet.
   bool callback_pending_;
 
   // Whether the InitTaskComplete() callback has been called.
   bool init_task_complete_;
 
   // Whether the initial scheduled upload timer has fired before the init task
   // has been completed.
   bool waiting_for_init_task_complete_;
 
+  // Used to get the connection type for deciding on upload interval.
+  const metrics::NetworkMetricsProvider* network_metrics_provider_;

[Alexei Svitkine (slow), 2015/02/13 22:39:50]

Ditto.

[gayane -on leave until 09-2017, 2015/02/17 19:38:02]

Removed

+
   DISALLOW_COPY_AND_ASSIGN(MetricsReportingScheduler);
 };
 
 }  // namespace metrics
 
 #endif  // COMPONENTS_METRICS_METRICS_REPORTING_SCHEDULER_H_