Submit buffered data use reports when Chromium is backgrounded

chrome/browser/android/data_usage/external_data_use_observer_unittest.cc

 // Copyright 2015 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 "chrome/browser/android/data_usage/external_data_use_observer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 357 matching lines @@
 
   // OnDataUse should trigger fetching of matching rules.
   OnDataUse(default_data_use());
 
   // Matching rules should not be expired.
   EXPECT_LT(base::TimeTicks::Now() -
                 external_data_use_observer()->last_matching_rules_fetch_time_,
             external_data_use_observer()->fetch_matching_rules_duration_);
 }
 
-// Tests if data use reports are sent only after the total bytes send/received
+// Tests if data use reports are sent only after the total bytes sent/received
 // across all buffered reports have reached the specified threshold.
 TEST_F(ExternalDataUseObserverTest, BufferDataUseReports) {
   AddDefaultMatchingRule();
   TriggerTabTrackingOnDefaultTab();
 
   // This tests reports 1024 bytes in each loop iteration. For the test to work
   // properly, |data_use_report_min_bytes_| should be a multiple of 1024.
   ASSERT_EQ(0, external_data_use_observer()->data_use_report_min_bytes_ % 1024);
 
   const size_t num_iterations =
       external_data_use_observer()->data_use_report_min_bytes_ / 1024;
 
   for (size_t i = 0; i < num_iterations; ++i) {
     data_usage::DataUse data_use = default_data_use();
     data_use.tx_bytes = 1024;
     data_use.rx_bytes = 0;
     OnDataUse(data_use);
 
     if (i != num_iterations - 1) {
       // Total buffered bytes is less than the minimum threshold. Data use
-      // report should not be send.
+      // report should not be sent.
       EXPECT_TRUE(external_data_use_observer()
                       ->last_data_report_submitted_ticks_.is_null());
       EXPECT_EQ(static_cast<int64_t>(i + 1),
                 external_data_use_observer()->total_bytes_buffered_ / 1024);
       EXPECT_EQ(0, external_data_use_observer()->pending_report_bytes_);
 
     } else {
       // Total bytes is at least the minimum threshold. This should trigger
       // submitting of the buffered data use report.
       EXPECT_FALSE(external_data_use_observer()
@@ skipping 23 matching lines @@
   external_data_use_observer()->OnReportDataUseDone(false);
   histogram_tester.ExpectTotalCount("DataUsage.ReportSubmissionResult", 2);
   histogram_tester.ExpectBucketCount(
       "DataUsage.ReportSubmissionResult",
       ExternalDataUseObserver::DATAUSAGE_REPORT_SUBMISSION_FAILED, 1);
   histogram_tester.ExpectUniqueSample(
       "DataUsage.ReportSubmission.Bytes.Failed",
       external_data_use_observer()->data_use_report_min_bytes_, 1);
 }
 
+#if defined(OS_ANDROID)
+// Tests data use report submission when application status callback is called.
+// Report should be submitted even if the number of bytes is less than the
+// threshold. Report should not be submitted if there is a pending report.
+TEST_F(ExternalDataUseObserverTest, DataUseReportingOnApplicationStatusChange) {
+  AddDefaultMatchingRule();
+  TriggerTabTrackingOnDefaultTab();
+
+  // Report with less than threshold bytes should be reported, on application
+  // state change to background.
+  data_usage::DataUse data_use = default_data_use();
+  data_use.tx_bytes = 1;
+  data_use.rx_bytes = 1;
+  OnDataUse(data_use);
+  EXPECT_TRUE(external_data_use_observer()
+                  ->last_data_report_submitted_ticks_.is_null());
+  EXPECT_EQ(2, external_data_use_observer()->total_bytes_buffered_);
+  EXPECT_EQ(0, external_data_use_observer()->pending_report_bytes_);
+
+  external_data_use_observer()->OnApplicationStateChange(
+      base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES);
+  EXPECT_FALSE(external_data_use_observer()
+                   ->last_data_report_submitted_ticks_.is_null());
+  EXPECT_EQ(0, external_data_use_observer()->total_bytes_buffered_);
+  EXPECT_EQ(2, external_data_use_observer()->pending_report_bytes_);
+  external_data_use_observer()->OnReportDataUseDone(true);
+
+  // Create pending report.
+  OnDataUse(default_data_use());
+  EXPECT_FALSE(external_data_use_observer()
+                   ->last_data_report_submitted_ticks_.is_null());
+  EXPECT_EQ(0, external_data_use_observer()->total_bytes_buffered_);
+  EXPECT_EQ(default_upload_bytes() + default_download_bytes(),
+            external_data_use_observer()->pending_report_bytes_);
+
+  // Application state change should not submit if there is a pending report.
+  data_use.tx_bytes = 1;
+  data_use.rx_bytes = 1;
+  OnDataUse(data_use);
+  external_data_use_observer()->OnApplicationStateChange(
+      base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES);
+  EXPECT_FALSE(external_data_use_observer()
+                   ->last_data_report_submitted_ticks_.is_null());
+  EXPECT_EQ(2, external_data_use_observer()->total_bytes_buffered_);
+  EXPECT_EQ(default_upload_bytes() + default_download_bytes(),
+            external_data_use_observer()->pending_report_bytes_);
+
+  // Once pending report submission done callback was received, report should be
+  // submitted on next application state change.
+  external_data_use_observer()->OnReportDataUseDone(true);
+  external_data_use_observer()->OnApplicationStateChange(
+      base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES);
+  EXPECT_EQ(0, external_data_use_observer()->total_bytes_buffered_);
+  EXPECT_EQ(2, external_data_use_observer()->pending_report_bytes_);
+}
+#endif

[tbansal1, 2015/12/30 00:12:05]

#endif  // OS_ANDROID

+
 // Tests if the parameters from the field trial are populated correctly.
 TEST_F(ExternalDataUseObserverTest, Variations) {
   std::map<std::string, std::string> variation_params;
 
   const int kFetchMatchingRulesDurationSeconds = 10000;
   const int kDefaultMaxDataReportSubmitWaitMsec = 20000;
   const int64_t kDataUseReportMinBytes = 5000;
   variation_params["fetch_matching_rules_duration_seconds"] =
       base::Int64ToString(kFetchMatchingRulesDurationSeconds);
   variation_params["data_report_submit_timeout_msec"] =
@@ skipping 31 matching lines @@
       "DataUsage.ReportSubmissionResult",
       ExternalDataUseObserver::DATAUSAGE_REPORT_SUBMISSION_TIMED_OUT, 1);
   histogram_tester.ExpectUniqueSample(
       "DataUsage.ReportSubmission.Bytes.TimedOut",
       default_upload_bytes() + default_download_bytes(), 1);
 }
 
 }  // namespace android
 
 }  // namespace chrome