| 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 ec9c92b00aaeb1b6fa4e79f87594ea7c24ff623e..1e34b882f97d9a4657103b07577c3ae333b115bd 100644
|
| --- a/chrome/browser/android/data_usage/external_data_use_observer.h
|
| +++ b/chrome/browser/android/data_usage/external_data_use_observer.h
|
| @@ -82,8 +82,8 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| // successfully submitted to the external data use observer by Java.
|
| void OnReportDataUseDone(bool success);
|
|
|
| - // Called by DataUseMatcher. |should_register| is true if |this| should
|
| - // register as a data use observer.
|
| + // Called by ExternalDataUseObserverBridge. |should_register| is true if
|
| + // |this| should register as a data use observer.
|
| void ShouldRegisterAsDataUseObserver(bool should_register);
|
|
|
| // Fetches the matching rules asynchronously.
|
| @@ -93,6 +93,7 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
|
|
| private:
|
| friend class DataUseTabModelTest;
|
| + friend class DataUseUITabModelTest;
|
| friend class ExternalDataUseObserverTest;
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferDataUseReports);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferSize);
|
| @@ -218,6 +219,11 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| // Aggregator that sends data use observations to |this|.
|
| data_usage::DataUseAggregator* data_use_aggregator_;
|
|
|
| + // |external_data_use_observer_bridge_| is owned by |this|, and interacts with
|
| + // the Java code. It is created on IO thread but afterwards, should only be
|
| + // accessed on UI thread.
|
| + ExternalDataUseObserverBridge* external_data_use_observer_bridge_;
|
| +
|
| // Maintains tab sessions and is owned by |this|. It is created on IO thread
|
| // but afterwards, should only be accessed on UI thread.
|
| DataUseTabModel* data_use_tab_model_;
|
| @@ -244,11 +250,6 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer {
|
| // Time when the matching rules were last fetched.
|
| base::TimeTicks last_matching_rules_fetch_time_;
|
|
|
| - // |external_data_use_observer_bridge_| is owned by |this|, and interacts with
|
| - // the Java code. It is created on IO thread but afterwards, should only be
|
| - // accessed on UI thread.
|
| - ExternalDataUseObserverBridge* external_data_use_observer_bridge_;
|
| -
|
| // Total number of bytes transmitted or received across all the buffered
|
| // reports.
|
| int64_t total_bytes_buffered_;
|
|
|