Commit 96819cfe authored by Ali Juma's avatar Ali Juma Committed by Commit Bot

[iOS] Add real-time-related arguments to SafeBrowsingUrlCheckerImpl's constructor

This CL adds arguments related to real-time lookups to the version
of SafeBrowsingUrlCheckerImpl's constructor that's used on iOS.

Bug: 1103220
Change-Id: I9b095860b5801e48b77e55213a1ccfd88f39e7f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314690Reviewed-by: default avatarVarun Khaneja <vakh@chromium.org>
Commit-Queue: Ali Juma <ajuma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791322}
parent 3acbe040
......@@ -124,17 +124,22 @@ SafeBrowsingUrlCheckerImpl::SafeBrowsingUrlCheckerImpl(
SafeBrowsingUrlCheckerImpl::SafeBrowsingUrlCheckerImpl(
ResourceType resource_type,
scoped_refptr<UrlCheckerDelegate> url_checker_delegate,
const base::RepeatingCallback<web::WebState*()>& web_state_getter)
const base::RepeatingCallback<web::WebState*()>& web_state_getter,
bool real_time_lookup_enabled,
bool can_rt_check_subresource_url,
base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui)
: load_flags_(0),
resource_type_(resource_type),
has_user_gesture_(false),
web_state_getter_(web_state_getter),
url_checker_delegate_(url_checker_delegate),
database_manager_(url_checker_delegate_->GetDatabaseManager()),
real_time_lookup_enabled_(false),
can_rt_check_subresource_url_(false),
can_check_db_(true) {
real_time_lookup_enabled_(real_time_lookup_enabled),
can_rt_check_subresource_url_(can_rt_check_subresource_url),
can_check_db_(true),
url_lookup_service_on_ui_(url_lookup_service_on_ui) {
DCHECK(!web_state_getter_.is_null());
DCHECK(!can_rt_check_subresource_url_ || real_time_lookup_enabled_);
}
SafeBrowsingUrlCheckerImpl::~SafeBrowsingUrlCheckerImpl() {
......
......@@ -89,12 +89,16 @@ class SafeBrowsingUrlCheckerImpl : public mojom::SafeBrowsingUrlChecker,
bool can_check_db,
base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui);
// Constructor that takes only a ResourceType and a UrlCheckerDelegate,
// omitting other arguments that never have non-default values on iOS.
// Constructor that takes only a ResourceType, a UrlCheckerDelegate, and
// real-time lookup-related arguments, omitting other arguments that never
// have non-default values on iOS.
SafeBrowsingUrlCheckerImpl(
ResourceType resource_type,
scoped_refptr<UrlCheckerDelegate> url_checker_delegate,
const base::RepeatingCallback<web::WebState*()>& web_state_getter);
const base::RepeatingCallback<web::WebState*()>& web_state_getter,
bool real_time_lookup_enabled,
bool can_rt_check_subresource_url,
base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui);
~SafeBrowsingUrlCheckerImpl() override;
......
......@@ -26,8 +26,10 @@ class FakeSafeBrowsingUrlCheckerImpl
resource_type,
base::MakeRefCounted<UrlCheckerDelegateImpl>(
/*database_manager=*/nullptr),
base::Bind([]() { return static_cast<web::WebState*>(nullptr); })) {
}
base::Bind([]() { return static_cast<web::WebState*>(nullptr); }),
/*real_time_lookup_enabled=*/false,
/*can_rt_check_subresource_url=*/false,
/*url_lookup_service_on_ui=*/nullptr) {}
~FakeSafeBrowsingUrlCheckerImpl() override = default;
// SafeBrowsingUrlCheckerImpl:
......
......@@ -84,7 +84,10 @@ SafeBrowsingServiceImpl::CreateUrlChecker(
safe_browsing::ResourceType resource_type,
web::WebState* web_state) {
return std::make_unique<safe_browsing::SafeBrowsingUrlCheckerImpl>(
resource_type, url_checker_delegate_, web_state->CreateDefaultGetter());
resource_type, url_checker_delegate_, web_state->CreateDefaultGetter(),
/*real_time_lookup_enabled=*/false,
/*can_rt_check_subresource_url=*/false,
/*url_lookup_service_on_ui=*/nullptr);
}
bool SafeBrowsingServiceImpl::CanCheckUrl(const GURL& url) const {
......
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