| Index: components/metrics/data_use_tracker_unittest.cc
|
| diff --git a/components/metrics/data_use_tracker_unittest.cc b/components/metrics/data_use_tracker_unittest.cc
|
| index 3e3e73c268b45571e597684800343f3fe766ed52..99811218fada25d07a4516e35ef3d1bc59f36ed3 100644
|
| --- a/components/metrics/data_use_tracker_unittest.cc
|
| +++ b/components/metrics/data_use_tracker_unittest.cc
|
| @@ -21,10 +21,7 @@ const char kExpiredDateStr2[] = "2016-03-01";
|
|
|
| class TestDataUsePrefService : public TestingPrefServiceSimple {
|
| public:
|
| - TestDataUsePrefService() {
|
| - registry()->RegisterDictionaryPref(metrics::prefs::kUserCellDataUse);
|
| - registry()->RegisterDictionaryPref(metrics::prefs::kUmaCellDataUse);
|
| - }
|
| + TestDataUsePrefService() { DataUseTracker::RegisterPrefs(registry()); }
|
|
|
| void ClearDataUsePrefs() {
|
| ClearPref(metrics::prefs::kUserCellDataUse);
|
| @@ -185,21 +182,27 @@ TEST(DataUseTrackerTest, CheckShouldUploadLogOnCellular) {
|
| local_state.ClearDataUsePrefs();
|
| SetPrefTestValuesOverRatio(&local_state);
|
|
|
| - bool can_upload = data_use_tracker.ShouldUploadLogOnCellular(50);
|
| + bool can_upload =
|
| + data_use_tracker.ShouldUploadLogOnCellular(50, MetricsLogUploader::UMA);
|
| EXPECT_TRUE(can_upload);
|
| - can_upload = data_use_tracker.ShouldUploadLogOnCellular(100);
|
| + can_upload =
|
| + data_use_tracker.ShouldUploadLogOnCellular(100, MetricsLogUploader::UMA);
|
| EXPECT_TRUE(can_upload);
|
| - can_upload = data_use_tracker.ShouldUploadLogOnCellular(150);
|
| + can_upload =
|
| + data_use_tracker.ShouldUploadLogOnCellular(150, MetricsLogUploader::UMA);
|
| EXPECT_FALSE(can_upload);
|
|
|
| local_state.ClearDataUsePrefs();
|
| SetPrefTestValuesValidRatio(&local_state);
|
| - can_upload = data_use_tracker.ShouldUploadLogOnCellular(100);
|
| + can_upload =
|
| + data_use_tracker.ShouldUploadLogOnCellular(100, MetricsLogUploader::UMA);
|
| EXPECT_TRUE(can_upload);
|
| // this is about 0.49%
|
| - can_upload = data_use_tracker.ShouldUploadLogOnCellular(200);
|
| + can_upload =
|
| + data_use_tracker.ShouldUploadLogOnCellular(200, MetricsLogUploader::UMA);
|
| EXPECT_TRUE(can_upload);
|
| - can_upload = data_use_tracker.ShouldUploadLogOnCellular(300);
|
| + can_upload =
|
| + data_use_tracker.ShouldUploadLogOnCellular(300, MetricsLogUploader::UMA);
|
| EXPECT_FALSE(can_upload);
|
| }
|
|
|
|
|