Index: content/public/test/mock_browsing_data_remover_delegate.cc |
diff --git a/chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc b/content/public/test/mock_browsing_data_remover_delegate.cc |
similarity index 85% |
rename from chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc |
rename to content/public/test/mock_browsing_data_remover_delegate.cc |
index 9c3e6e5f29aa86facccc6f648d3310547df419bf..6396392bb46862c0fd720dd523c341631bea92c7 100644 |
--- a/chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc |
+++ b/content/public/test/mock_browsing_data_remover_delegate.cc |
@@ -2,12 +2,14 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h" |
+#include "content/public/test/mock_browsing_data_remover_delegate.h" |
#include "base/callback.h" |
#include "content/public/browser/browsing_data_filter_builder.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+namespace content { |
+ |
MockBrowsingDataRemoverDelegate::MockBrowsingDataRemoverDelegate() {} |
MockBrowsingDataRemoverDelegate::~MockBrowsingDataRemoverDelegate() { |
@@ -60,7 +62,19 @@ void MockBrowsingDataRemoverDelegate::ExpectCallDontCareAboutFilterBuilder( |
} |
void MockBrowsingDataRemoverDelegate::VerifyAndClearExpectations() { |
- EXPECT_EQ(expected_calls_, actual_calls_); |
+ EXPECT_EQ(expected_calls_.size(), actual_calls_.size()) |
+ << expected_calls_.size() << " calls were expected, but " |
+ << actual_calls_.size() << " were made."; |
+ |
+ if (expected_calls_.size() == actual_calls_.size()) { |
+ auto actual = actual_calls_.begin(); |
+ int count = 0; |
+ for (auto expected = expected_calls_.begin(); |
+ expected != expected_calls_.end(); expected++, actual++, count++) { |
+ EXPECT_EQ(*expected, *actual) << "Call #" << count << " differs."; |
+ } |
+ } |
+ |
expected_calls_.clear(); |
actual_calls_.clear(); |
} |
@@ -96,3 +110,5 @@ bool MockBrowsingDataRemoverDelegate::CallParameters::operator==( |
return true; |
return *a.filter_builder_ == *b.filter_builder_; |
} |
+ |
+} // content |