Chromium Code Reviews| 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 30f6e6aed57e83ac9cfa3f561f6430167a99bc8c..9798b5d8e25059671b8245d7454b07f18a26a553 100644 |
| --- a/chrome/browser/android/data_usage/external_data_use_observer.h |
| +++ b/chrome/browser/android/data_usage/external_data_use_observer.h |
| @@ -96,27 +96,28 @@ class ExternalDataUseObserver : public data_usage::DataUseAggregator::Observer { |
| bool MatchesAppPackageName(const std::string& app_package_name, |
| std::string* label) const; |
| - DataUseTabModel* data_use_tab_model() const { |
| - return data_use_tab_model_.get(); |
| - } |
| + DataUseTabModel* GetDataUseTabModel() const; |
| private: |
| friend class DataUseTabModelTest; |
| friend class ExternalDataUseObserverTest; |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, SingleRegex); |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, TwoRegex); |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleRegex); |
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, |
| + AtMostOneDataUseSubmitRequest); |
|
sclittle
2015/11/30 22:33:38
nit: I don't think this test exists anymore
tbansal1
2015/11/30 22:59:09
Done.
|
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferDataUseReports); |
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferSize); |
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ChangeRegex); |
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, HashFunction); |
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, LabelRemoved); |
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleMatchingRules); |
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleRegex); |
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, |
| + PeriodicFetchMatchingRules); |
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ReportsMergedCorrectly); |
| + FRIEND_TEST_ALL_PREFIXES(DataUseUITabModelTest, ReportTabEventsTest); |
|
sclittle
2015/11/30 22:33:38
nit: This should alphabetically come before the Ex
tbansal1
2015/11/30 22:59:09
Done.
|
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, SingleRegex); |
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, |
| TimestampsMergedCorrectly); |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, HashFunction); |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferSize); |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, |
| - PeriodicFetchMatchingRules); |
| - FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferDataUseReports); |
| + FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, TwoRegex); |
| FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, Variations); |
| // DataUseReportKey is a unique identifier for a data use report. |