| Index: chrome/browser/safe_browsing/protocol_manager.cc
|
| diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
|
| index 57d02b416c5bc18cf3b6202a2a57c8604329b0a6..3230e47583130a11f99b8a725e26cd50440c80f4 100644
|
| --- a/chrome/browser/safe_browsing/protocol_manager.cc
|
| +++ b/chrome/browser/safe_browsing/protocol_manager.cc
|
| @@ -123,6 +123,9 @@ SafeBrowsingProtocolManager::SafeBrowsingProtocolManager(
|
| backup_update_reason_(BACKUP_UPDATE_REASON_MAX),
|
| disable_auto_update_(config.disable_auto_update),
|
| url_fetcher_id_(0),
|
| +#if defined(OS_ANDROID)
|
| + disable_connection_check_(config.disable_connection_check),
|
| +#endif
|
| app_in_foreground_(true) {
|
| DCHECK(!url_prefix_.empty());
|
|
|
| @@ -198,11 +201,13 @@ void SafeBrowsingProtocolManager::GetNextUpdate() {
|
| return;
|
|
|
| #if defined(OS_ANDROID)
|
| - net::NetworkChangeNotifier::ConnectionType type =
|
| - net::NetworkChangeNotifier::GetConnectionType();
|
| - if (type != net::NetworkChangeNotifier::CONNECTION_WIFI) {
|
| - ScheduleNextUpdate(false /* no back off */);
|
| - return;
|
| + if (!disable_connection_check_) {
|
| + net::NetworkChangeNotifier::ConnectionType type =
|
| + net::NetworkChangeNotifier::GetConnectionType();
|
| + if (type != net::NetworkChangeNotifier::CONNECTION_WIFI) {
|
| + ScheduleNextUpdate(false /* no back off */);
|
| + return;
|
| + }
|
| }
|
| #endif
|
|
|
|
|