| Index: chrome/browser/android/data_usage/external_data_use_observer.h
|
| diff --git a/chrome/browser/android/data_usage/external_data_use_observer.h b/chrome/browser/android/data_usage/external_data_use_observer.h
|
| index 2cb052439b16fae87f43a9ca64799d17e8c52dd5..46a2dd9fe854adf78b28c1ca68cf7fb0240af368 100644
|
| --- a/chrome/browser/android/data_usage/external_data_use_observer.h
|
| +++ b/chrome/browser/android/data_usage/external_data_use_observer.h
|
| @@ -103,10 +103,10 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| private:
|
| friend class DataUseTabModelTest;
|
| friend class ExternalDataUseObserverTest;
|
| - FRIEND_TEST_ALL_PREFIXES(DataUseUITabModelTest, ReportTabEventsTest);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferDataUseReports);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferSize);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ChangeRegex);
|
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, DataUseReportTimedOut);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, HashFunction);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, LabelRemoved);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleMatchingRules);
|
| @@ -114,6 +114,7 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest,
|
| PeriodicFetchMatchingRules);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ReportsMergedCorrectly);
|
| + FRIEND_TEST_ALL_PREFIXES(DataUseUITabModelTest, ReportTabEventsTest);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, SingleRegex);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest,
|
| TimestampsMergedCorrectly);
|
| @@ -279,8 +280,14 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| // True if callback from |FetchMatchingRulesDone| is currently pending.
|
| bool matching_rules_fetch_pending_;
|
|
|
| - // True if callback from |SubmitDataUseReportCallback| is currently pending.
|
| - bool submit_data_report_pending_;
|
| + // Time when the currently pending data use report was submitted.
|
| + // |last_data_report_submitted_ticks_| is null if no data use report is
|
| + // currently pending.
|
| + base::TimeTicks last_data_report_submitted_ticks_;
|
| +
|
| + // |pending_report_bytes_| is the total byte count in the data use report that
|
| + // is currently pending.
|
| + int64_t pending_report_bytes_;
|
|
|
| // Contains matching rules.
|
| std::vector<scoped_ptr<MatchingRule>> matching_rules_;
|
| @@ -317,6 +324,10 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| // submitted.
|
| const int64_t data_use_report_min_bytes_;
|
|
|
| + // If a data use report is pending for more than |data_report_submit_timeout_|
|
| + // duration, it is considered as timed out.
|
| + const base::TimeDelta data_report_submit_timeout_;
|
| +
|
| base::ThreadChecker thread_checker_;
|
|
|
| // |io_weak_factory_| and |ui_weak_factory_| are used for posting tasks on the
|
|
|