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"
 
 namespace metrics {
 
 // Scheduler task to drive a MetricsService object's uploading.
 class MetricsReportingScheduler {
  public:
-  explicit MetricsReportingScheduler(const base::Closure& upload_callback);
+  // Creates MetricsServiceScheduler object with the given |upload_callback|
+  // callback to call when uploading should happen and |cellular_callback|
+  // callback to get current network connection type.
+  MetricsReportingScheduler(
+      const base::Closure& upload_callback,
+      const base::Callback<void(bool*)>& cellular_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 whether the network connection is cellular or not.
+  void SetConnectionType(bool is_cellular);

[Alexei Svitkine (slow), 2015/02/18 22:03:09]

Is this needed anymore?

[gayane -on leave until 09-2017, 2015/02/19 16:24:35]

Removed.

+
  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.
@@ skipping 25 matching lines @@
   // 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_;
 
+  // Callback function from MetricsService used to get current network

[Alexei Svitkine (slow), 2015/02/18 22:03:09]

Don't say "from MetricsService" - just what it's for is good enough.

[gayane -on leave until 09-2017, 2015/02/19 16:24:35]

Done.

+  // connection type.
+  base::Callback<void(bool*)> cellular_callback_;
+
+  // Indicates whether network connection is cellular or not.
+  // Default value is |true| because cellular mode is more conservative.
+  bool is_cellular_connection_;

[Alexei Svitkine (slow), 2015/02/18 22:03:08]

This isn't needed anymore, right?

[gayane -on leave until 09-2017, 2015/02/19 16:24:35]

Done.

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