Commit f0c0568f authored by Makoto Shimazu's avatar Makoto Shimazu Committed by Commit Bot

Convert base::Bind to base::Bind{Once,Repeating} in content/browser

This CL converts base::Bind to BindOnce or BindRepeating, and also changes
relevant base::Callbacks or base::Closures to appropriate types.

This CL is split from https://crrev.com/c/1831621.

This CL was uploaded by git cl split.

R=msramek@chromium.org

Bug: 1007760
Change-Id: If363fd450c6a7118b8d622e8ae3b9c2777f96524
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849541
Commit-Queue: Martin Šrámek <msramek@chromium.org>
Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Auto-Submit: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705064}
parent 59635dd0
...@@ -204,12 +204,12 @@ class TestWebappRegistry : public WebappRegistry { ...@@ -204,12 +204,12 @@ class TestWebappRegistry : public WebappRegistry {
TestWebappRegistry() : WebappRegistry() { } TestWebappRegistry() : WebappRegistry() { }
void UnregisterWebappsForUrls( void UnregisterWebappsForUrls(
const base::Callback<bool(const GURL&)>& url_filter) override { const base::RepeatingCallback<bool(const GURL&)>& url_filter) override {
// Mocks out a JNI call. // Mocks out a JNI call.
} }
void ClearWebappHistoryForUrls( void ClearWebappHistoryForUrls(
const base::Callback<bool(const GURL&)>& url_filter) override { const base::RepeatingCallback<bool(const GURL&)>& url_filter) override {
// Mocks out a JNI call. // Mocks out a JNI call.
} }
}; };
...@@ -530,7 +530,7 @@ class ClearDomainReliabilityTester { ...@@ -530,7 +530,7 @@ class ClearDomainReliabilityTester {
return last_clear_mode_; return last_clear_mode_;
} }
const base::Callback<bool(const GURL&)>& last_filter() const { const base::RepeatingCallback<bool(const GURL&)>& last_filter() const {
return last_filter_; return last_filter_;
} }
...@@ -710,18 +710,19 @@ class FlashContentSettingsChangeWaiter : public content_settings::Observer { ...@@ -710,18 +710,19 @@ class FlashContentSettingsChangeWaiter : public content_settings::Observer {
// filters, but its constructor currently only takes a single URL and constructs // filters, but its constructor currently only takes a single URL and constructs
// its own url filter. If an url filter was directly passed to // its own url filter. If an url filter was directly passed to
// BrowsingDataRemover (what should eventually be the case), we can use the same // BrowsingDataRemover (what should eventually be the case), we can use the same
// instance in the test as well, and thus simply test base::Callback::Equals() // instance in the test as well, and thus simply test
// in this matcher. // base::RepeatingCallback::Equals() in this matcher.
class ProbablySameFilterMatcher class ProbablySameFilterMatcher
: public MatcherInterface<const base::Callback<bool(const GURL&)>&> { : public MatcherInterface<
const base::RepeatingCallback<bool(const GURL&)>&> {
public: public:
explicit ProbablySameFilterMatcher( explicit ProbablySameFilterMatcher(
const base::Callback<bool(const GURL&)>& filter) const base::RepeatingCallback<bool(const GURL&)>& filter)
: to_match_(filter) { : to_match_(filter) {}
}
virtual bool MatchAndExplain(const base::Callback<bool(const GURL&)>& filter, virtual bool MatchAndExplain(
MatchResultListener* listener) const { const base::RepeatingCallback<bool(const GURL&)>& filter,
MatchResultListener* listener) const {
if (filter.is_null() && to_match_.is_null()) if (filter.is_null() && to_match_.is_null())
return true; return true;
if (filter.is_null() != to_match_.is_null()) if (filter.is_null() != to_match_.is_null())
...@@ -748,17 +749,17 @@ class ProbablySameFilterMatcher ...@@ -748,17 +749,17 @@ class ProbablySameFilterMatcher
} }
private: private:
const base::Callback<bool(const GURL&)>& to_match_; const base::RepeatingCallback<bool(const GURL&)>& to_match_;
}; };
inline Matcher<const base::Callback<bool(const GURL&)>&> ProbablySameFilter( inline Matcher<const base::RepeatingCallback<bool(const GURL&)>&>
const base::Callback<bool(const GURL&)>& filter) { ProbablySameFilter(const base::RepeatingCallback<bool(const GURL&)>& filter) {
return MakeMatcher(new ProbablySameFilterMatcher(filter)); return MakeMatcher(new ProbablySameFilterMatcher(filter));
} }
bool ProbablySameFilters( bool ProbablySameFilters(
const base::Callback<bool(const GURL&)>& filter1, const base::RepeatingCallback<bool(const GURL&)>& filter1,
const base::Callback<bool(const GURL&)>& filter2) { const base::RepeatingCallback<bool(const GURL&)>& filter2) {
return ProbablySameFilter(filter1).MatchAndExplain(filter2, nullptr); return ProbablySameFilter(filter1).MatchAndExplain(filter2, nullptr);
} }
...@@ -1899,7 +1900,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDownloads) { ...@@ -1899,7 +1900,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDownloads) {
TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordStatistics) { TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordStatistics) {
RemovePasswordsTester tester(GetProfile()); RemovePasswordsTester tester(GetProfile());
base::Callback<bool(const GURL&)> empty_filter; base::RepeatingCallback<bool(const GURL&)> empty_filter;
EXPECT_CALL(*tester.store(), RemoveStatisticsByOriginAndTimeImpl( EXPECT_CALL(*tester.store(), RemoveStatisticsByOriginAndTimeImpl(
ProbablySameFilter(empty_filter), ProbablySameFilter(empty_filter),
...@@ -1918,7 +1919,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ...@@ -1918,7 +1919,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
std::unique_ptr<BrowsingDataFilterBuilder> builder( std::unique_ptr<BrowsingDataFilterBuilder> builder(
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST));
builder->AddRegisterableDomain(kTestRegisterableDomain1); builder->AddRegisterableDomain(kTestRegisterableDomain1);
base::Callback<bool(const GURL&)> filter = builder->BuildGeneralFilter(); base::RepeatingCallback<bool(const GURL&)> filter =
builder->BuildGeneralFilter();
EXPECT_CALL(*tester.store(), EXPECT_CALL(*tester.store(),
RemoveStatisticsByOriginAndTimeImpl( RemoveStatisticsByOriginAndTimeImpl(
...@@ -1930,7 +1932,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ...@@ -1930,7 +1932,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordsByTimeOnly) { TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePasswordsByTimeOnly) {
RemovePasswordsTester tester(GetProfile()); RemovePasswordsTester tester(GetProfile());
base::Callback<bool(const GURL&)> filter = base::RepeatingCallback<bool(const GURL&)> filter =
BrowsingDataFilterBuilder::BuildNoopFilter(); BrowsingDataFilterBuilder::BuildNoopFilter();
EXPECT_CALL(*tester.store(), EXPECT_CALL(*tester.store(),
...@@ -1948,7 +1950,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ...@@ -1948,7 +1950,8 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
std::unique_ptr<BrowsingDataFilterBuilder> builder( std::unique_ptr<BrowsingDataFilterBuilder> builder(
BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST));
builder->AddRegisterableDomain(kTestRegisterableDomain1); builder->AddRegisterableDomain(kTestRegisterableDomain1);
base::Callback<bool(const GURL&)> filter = builder->BuildGeneralFilter(); base::RepeatingCallback<bool(const GURL&)> filter =
builder->BuildGeneralFilter();
EXPECT_CALL(*tester.store(), EXPECT_CALL(*tester.store(),
RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _)) RemoveLoginsByURLAndTimeImpl(ProbablySameFilter(filter), _, _))
...@@ -1961,7 +1964,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ...@@ -1961,7 +1964,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
TEST_F(ChromeBrowsingDataRemoverDelegateTest, DisableAutoSignIn) { TEST_F(ChromeBrowsingDataRemoverDelegateTest, DisableAutoSignIn) {
RemovePasswordsTester tester(GetProfile()); RemovePasswordsTester tester(GetProfile());
base::Callback<bool(const GURL&)> empty_filter = base::RepeatingCallback<bool(const GURL&)> empty_filter =
BrowsingDataFilterBuilder::BuildNoopFilter(); BrowsingDataFilterBuilder::BuildNoopFilter();
EXPECT_CALL( EXPECT_CALL(
...@@ -1977,7 +1980,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, DisableAutoSignIn) { ...@@ -1977,7 +1980,7 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, DisableAutoSignIn) {
TEST_F(ChromeBrowsingDataRemoverDelegateTest, TEST_F(ChromeBrowsingDataRemoverDelegateTest,
DisableAutoSignInAfterRemovingPasswords) { DisableAutoSignInAfterRemovingPasswords) {
RemovePasswordsTester tester(GetProfile()); RemovePasswordsTester tester(GetProfile());
base::Callback<bool(const GURL&)> empty_filter = base::RepeatingCallback<bool(const GURL&)> empty_filter =
BrowsingDataFilterBuilder::BuildNoopFilter(); BrowsingDataFilterBuilder::BuildNoopFilter();
EXPECT_CALL(*tester.store(), RemoveLoginsByURLAndTimeImpl(_, _, _)) EXPECT_CALL(*tester.store(), RemoveLoginsByURLAndTimeImpl(_, _, _))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment