Index: chrome/browser/android/data_usage/external_data_use_observer_unittest.cc |
diff --git a/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc b/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc |
index 9153ad4474a0b8476efac34753d4bde67553b6bd..f5eb7cb3436eae04948c3bd8dd6712b638b482de 100644 |
--- a/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc |
+++ b/chrome/browser/android/data_usage/external_data_use_observer_unittest.cc |
@@ -247,7 +247,7 @@ TEST_F(ExternalDataUseObserverTest, AtMostOneDataUseSubmitRequest) { |
url_regexes.push_back( |
"http://www[.]google[.]com/#q=.*|https://www[.]google[.]com/#q=.*"); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
std::vector<std::string>(url_regexes.size(), label)); |
EXPECT_EQ(0U, external_data_use_observer()->buffered_data_reports_.size()); |
@@ -279,7 +279,7 @@ TEST_F(ExternalDataUseObserverTest, BufferSize) { |
url_regexes.push_back( |
"http://www[.]google[.]com/#q=.*|https://www[.]google[.]com/#q=.*"); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
std::vector<std::string>(url_regexes.size(), label)); |
@@ -324,7 +324,7 @@ TEST_F(ExternalDataUseObserverTest, ReportsMergedCorrectly) { |
url_regexes.push_back( |
"http://www[.]google[.]com/#q=.*|https://www[.]google[.]com/#q=.*"); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
std::vector<std::string>(url_regexes.size(), label)); |
@@ -392,7 +392,7 @@ TEST_F(ExternalDataUseObserverTest, TimestampsMergedCorrectly) { |
url_regexes.push_back( |
"http://www[.]google[.]com/#q=.*|https://www[.]google[.]com/#q=.*"); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
std::vector<std::string>(url_regexes.size(), label)); |
@@ -442,7 +442,7 @@ TEST_F(ExternalDataUseObserverTest, MultipleMatchingRules) { |
labels.push_back(label_foo); |
labels.push_back(label_bar); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
labels); |
EXPECT_EQ(0U, external_data_use_observer()->buffered_data_reports_.size()); |
@@ -521,7 +521,7 @@ TEST_F(ExternalDataUseObserverTest, PeriodicFetchMatchingRules) { |
url_regexes.push_back( |
"http://www[.]google[.]com/#q=.*|https://www[.]google[.]com/#q=.*"); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
std::vector<std::string>(url_regexes.size(), label)); |
@@ -562,7 +562,7 @@ TEST_F(ExternalDataUseObserverTest, BufferDataUseReports) { |
url_regexes.push_back( |
"http://www[.]google[.]com/#q=.*|https://www[.]google[.]com/#q=.*"); |
- external_data_use_observer()->FetchMatchingRulesCallbackOnIOThread( |
+ external_data_use_observer()->FetchMatchingRulesDoneOnIOThread( |
std::vector<std::string>(url_regexes.size(), std::string()), url_regexes, |
std::vector<std::string>(url_regexes.size(), label)); |