@ -11,7 +11,7 @@ Subject: Fix build error caused by the removal of safe_browsing
chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | 8
chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java | 7
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java | 7
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java | 6
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java | 4
chrome/browser/android/tab_web_contents_delegate_android.cc | 5
chrome/browser/password_manager/chrome_password_manager_client.cc | 2
chrome/browser/preferences/BUILD.gn | 1
@ -21,28 +21,32 @@ Subject: Fix build error caused by the removal of safe_browsing
chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/RadioButtonGroupSafeBrowsingPreference.java | 28 -
chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/SafeBrowsingSettingsFragment.java | 168 -------
chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/StandardProtectionSettingsFragment.java | 8
chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc | 6
components/safe_browsing/content/browser/client_side_detection_host.cc | 17
components/safe_browsing/content/browser/client_side_detection_host.h | 3
components/safe_browsing/content/browser/client_side_detection_service.cc | 31 -
components/safe_browsing/content/browser/safe_browsing_tab_observer.cc | 9
components/safe_browsing/content/browser/triggers/trigger_throttler.cc | 1
components/safe_browsing/content/browser/user_population.cc | 8
weblayer/browser/browser_context_impl.cc | 2
weblayer/browser/browser_process.cc | 11
weblayer/browser/browser_process.h | 4
weblayer/browser/browsing_data_remover_delegate.cc | 2
weblayer/browser/content_browser_client_impl.cc | 39 -
weblayer/browser/profile_impl.cc | 16
weblayer/browser/safe_browsing/client_side_detection_service_delegate.cc | 12
weblayer/browser/profile_impl.cc | 11
weblayer/browser/safe_browsing/client_side_detection_service_factory.cc | 4
weblayer/browser/safe_browsing/real_time_url_lookup_service_factory.cc | 7
weblayer/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.cc | 3
weblayer/browser/safe_browsing/safe_browsing_service.cc | 213 ----------
weblayer/browser/safe_browsing/safe_browsing_tab_observer.cc | 11
weblayer/browser/safe_browsing/weblayer_client_side_detection_host_delegate.cc | 4
weblayer/browser/safe_browsing/weblayer_client_side_detection_service_delegate.cc | 4
weblayer/browser/safe_browsing/weblayer_safe_browsing_blocking_page_factory.cc | 6
weblayer/browser/tab_impl.cc | 2
35 files changed, 57 insertions(+), 623 deletions(-)
weblayer/browser/safe_browsing/weblayer_safe_browsing_tab_observer_delegate.cc | 12
weblayer/browser/tab_impl.cc | 16
39 files changed, 60 insertions(+), 643 deletions(-)
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -377,7 +377 ,6 @@ android_library("chrome_java") {
@@ -381,7 +381 ,6 @@ android_library("chrome_java") {
"//chrome/browser/privacy:java",
"//chrome/browser/privacy_sandbox/android:java",
"//chrome/browser/profiles/android:java",
@ -104,7 +108,7 @@ Subject: Fix build error caused by the removal of safe_browsing
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
#include "components/site_isolation/pref_names.h"
#include "components/site_isolation/site_isolation_policy.h"
@@ -283,7 +282 ,6 @@ void BrowserContextImpl::RegisterPrefs(
@@ -288,7 +287 ,6 @@ void BrowserContextImpl::RegisterPrefs(
StatefulSSLHostStateDelegate::RegisterProfilePrefs(pref_registry);
HostContentSettingsMap::RegisterProfilePrefs(pref_registry);
@ -158,7 +162,7 @@ Subject: Fix build error caused by the removal of safe_browsing
}
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -351,7 +351 ,6 @@ static_library("safe_browsing") {
@@ -363,7 +363 ,6 @@ static_library("safe_browsing") {
]
}
deps += [
@ -192,7 +196,7 @@ Subject: Fix build error caused by the removal of safe_browsing
void TabWebContentsDelegateAndroid::RunFileChooser(
--- a/weblayer/browser/content_browser_client_impl.cc
+++ b/weblayer/browser/content_browser_client_impl.cc
@@ -514,33 +514 ,6 @@ ContentBrowserClientImpl::CreateURLLoade
@@ -518,33 +518 ,6 @@ ContentBrowserClientImpl::CreateURLLoade
int frame_tree_node_id) {
std::vector<std::unique_ptr<blink::URLLoaderThrottle>> result;
@ -226,7 +230,7 @@ Subject: Fix build error caused by the removal of safe_browsing
auto signin_throttle =
SigninURLLoaderThrottle::Create(browser_context, wc_getter);
if (signin_throttle)
@@ -852,13 +825 ,6 @@ ContentBrowserClientImpl::CreateThrottle
@@ -849,13 +822 ,6 @@ ContentBrowserClientImpl::CreateThrottle
#if defined(OS_ANDROID)
if (handle->IsInMainFrame()) {
@ -240,7 +244,7 @@ Subject: Fix build error caused by the removal of safe_browsing
std::unique_ptr<content::NavigationThrottle> intercept_navigation_throttle =
navigation_interception::InterceptNavigationDelegate::
MaybeCreateThrottleFor(
@@ -951,11 +917 ,6 @@ void ContentBrowserClientImpl::ExposeInt
@@ -948,11 +914 ,6 @@ void ContentBrowserClientImpl::ExposeInt
};
registry->AddInterface(base::BindRepeating(create_spellcheck_host),
content::GetUIThreadTaskRunner({}));
@ -519,19 +523,16 @@ Subject: Fix build error caused by the removal of safe_browsing
#include "components/unified_consent/pref_names.h"
#include "ui/gfx/android/java_bitmap.h"
#include "weblayer/browser/android/metrics/weblayer_metrics_service_client.h"
@@ -640,11 +639,6 @@ void ProfileImpl::SetBooleanSetting(Sett
@@ -640,7 +639,7 @@ void ProfileImpl::SetBooleanSetting(Sett
auto* pref_service = GetBrowserContext()->pref_service();
switch (type) {
case SettingType::BASIC_SAFE_BROWSING_ENABLED:
-#if defined(OS_ANDROID)
- safe_browsing::SetSafeBrowsingState(
- pref_service, value ? safe_browsing::STANDARD_PROTECTION
- : safe_browsing::NO_SAFE_BROWSING);
-#endif
break;
case SettingType::UKM_ENABLED: {
#if defined(OS_ANDROID)
@@ -659,10 +653,6 @@ void ProfileImpl::SetBooleanSetting(Sett
+#if 0
safe_browsing::SetSafeBrowsingState(
pref_service,
value ? safe_browsing::SafeBrowsingState::STANDARD_PROTECTION
@@ -660,10 +659,6 @@ void ProfileImpl::SetBooleanSetting(Sett
break;
}
case SettingType::EXTENDED_REPORTING_SAFE_BROWSING_ENABLED:
@ -542,24 +543,24 @@ Subject: Fix build error caused by the removal of safe_browsing
break;
case SettingType::REAL_TIME_SAFE_BROWSING_ENABLED:
#if defined(OS_ANDROID)
@@ -681,16 +671,12 @@ bool ProfileImpl::GetBooleanSetting(Sett
@@ -681,7 +676,7 @@ bool ProfileImpl::GetBooleanSetting(Sett
auto* pref_service = GetBrowserContext()->pref_service();
switch (type) {
case SettingType::BASIC_SAFE_BROWSING_ENABLED:
#if defined(OS_ANDROID)
- return safe_browsing::IsSafeBrowsingEnabled(*pref_service);
+ return false;
#endif
- #if defined(OS_ANDROID)
+#if 0
return sa fe_browsing::IsS afeBrowsingEnab led(*pref_ service) ;
#else
return false;
@@ -689,7 +684,7 @@ bool ProfileImpl::GetBooleanSetting(Sett
case SettingType::UKM_ENABLED:
return pref_service->GetBoolean(prefs::kUkmEnabled);
case SettingType::EXTENDED_REPORTING_SAFE_BROWSING_ENABLED:
-#if defined(OS_ANDROID)
- return pref_service->GetBoolean(
- ::prefs::kSafeBrowsingScoutReportingEnabled);
-#endif
return false;
case SettingType::REAL_TIME_SAFE_BROWSING_ENABLED:
#if defined(OS_ANDROID)
+#if 0
return pref_service->GetBoolean(
::prefs::kSafeBrowsingScoutReportingEnabled);
#else
--- a/weblayer/browser/browser_process.cc
+++ b/weblayer/browser/browser_process.cc
@@ -122,20 +122,9 @@ void BrowserProcess::CreateSubresourceFi
@ -809,16 +810,18 @@ Subject: Fix build error caused by the removal of safe_browsing
static boolean isPromoDismissedInSharedPreference() {
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
@@ -123,11 +123,7 @@ public class SignInPreference
@@ -111,14 +111,10 @@ public class SignInPreference
.getSigninManager(Profile.getLastUsedRegularProfile())
.isSigninDisabledByPolicy()) {
// TODO(https://crbug.com/1133739): Clean up after revising isSigninDisabledByPolicy.
- if (mPrefService.isManagedPreference(Pref.SIGNIN_ALLOWED)) {
- setupSigninDisabledByPolicy();
- } else {
- setupSigninDisallowed();
setupSigninDisallowed();
assert !mIsShowingSigninPromo
: "Signin Promo should not be shown when signin is not allowed";
setVisible(false);
- }
+ setupSigninDisallowed();
return;
}
@ -846,7 +849,7 @@ Subject: Fix build error caused by the removal of safe_browsing
private void onPromoSeen() {
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -24,8 +24 ,6 @@ import org.chromium.chrome.browser.priva
@@ -23,8 +23 ,6 @@ import org.chromium.chrome.browser.priva
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxReferrer;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment;
import org.chromium.chrome.browser.profiles.Profile;
@ -855,7 +858,7 @@ Subject: Fix build error caused by the removal of safe_browsing
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -85,11 +83 ,7 @@ public class PrivacySettings
@@ -84,11 +82 ,7 @@ public class PrivacySettings
}
Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING);
@ -867,7 +870,7 @@ Subject: Fix build error caused by the removal of safe_browsing
return false;
});
@@ -199,8 +193 ,6 @@ public class PrivacySettings
@@ -198,8 +192 ,6 @@ public class PrivacySettings
Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING);
if (safeBrowsingPreference != null && safeBrowsingPreference.isVisible()) {
@ -1144,7 +1147,7 @@ Subject: Fix build error caused by the removal of safe_browsing
}
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -460,7 +460 ,9 @@ void ChromePasswordManagerClient::ShowTo
@@ -463,7 +463 ,9 @@ void ChromePasswordManagerClient::ShowTo
#if defined(OS_ANDROID)
void ChromePasswordManagerClient::OnPasswordSelected(
const std::u16string& text) {
@ -1161,10 +1164,10 @@ Subject: Fix build error caused by the removal of safe_browsing
if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_COOKIES) {
network::mojom::NetworkContext* safe_browsing_context = nullptr;
-#if defined(OS_ANDROID)
+#if !defined(OS_ANDROID)
auto* sb_service = BrowserProcess::GetInstance()->GetSafeBrowsingService();
if (sb_service )
safe_browsing_context = sb_service ->GetNetworkContext();
+#if 0
safe_browsing_context = BrowserProcess::GetInstance()
->GetSafeBrowsingService( )
->GetNetworkContext();
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -83,18 +83,7 @@ ClientSideDetectionService::ClientSideDe
@ -1214,8 +1217,8 @@ Subject: Fix build error caused by the removal of safe_browsing
@@ -409,7 +394,6 @@ void ClientSideDetectionService::AddPhis
base::ListValue time_list;
for (const base::Time& timestamp : phishing_report_times_)
time_list.Append(base::Value(timestamp .ToDoubleT()));
for (const base::Time& report_ time : phishing_report_times_)
time_list.Append(base::Value(report_ time.ToDoubleT()));
- delegate_->GetPrefs()->Set(prefs::kSafeBrowsingCsdPingTimestamps, time_list);
}
@ -1236,7 +1239,7 @@ Subject: Fix build error caused by the removal of safe_browsing
// static
--- a/components/safe_browsing/content/browser/client_side_detection_host.h
+++ b/components/safe_browsing/content/browser/client_side_detection_host.h
@@ -19,13 +19,14 @@
@@ -20,12 +20,13 @@
#include "components/safe_browsing/content/common/safe_browsing.mojom.h"
#include "components/safe_browsing/core/browser/db/database_manager.h"
#include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
@ -1244,7 +1247,6 @@ Subject: Fix build error caused by the removal of safe_browsing
#include "content/public/browser/web_contents_observer.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "url/gurl.h"
+class PrefService;
@ -1292,71 +1294,54 @@ Subject: Fix build error caused by the removal of safe_browsing
!account_signed_in_callback_.is_null() &&
account_signed_in_callback_.Run();
}
--- a/weblayer/browser/safe_browsing /safe_browsing_tab_observer.cc
+++ b/weblayer/browser/safe_browsing /safe_browsing_tab_observer.cc
@@ -45,16 +45,11 @@ SafeBrowsingTabObserver::SafeBrowsingTab
PrefService* prefs = browser_context->pref_service( );
--- a/components/safe_browsing/content/browser /safe_browsing_tab_observer.cc
+++ b/components/safe_browsing/content/browser /safe_browsing_tab_observer.cc
@@ -34,15 +34,10 @@ SafeBrowsingTabObserver::SafeBrowsingTab
PrefService* prefs = delegate_->GetPrefs(browser_context );
if (prefs) {
pref_change_registrar_.Init(prefs);
- pref_change_registrar_.Add(
- :: prefs::kSafeBrowsingEnabled,
- prefs::kSafeBrowsingEnabled,
- base::BindRepeating(
- &SafeBrowsingTabObserver::UpdateSafebrowsingDetectionHost,
- base::Unretained(this)));
safe_browsing::ClientSideDetectionService* csd_service =
ClientSideDetectionServiceFactory::GetForBrowserContext(
browser_context);
- if (safe_browsing::IsSafeBrowsingEnabled(*prefs) &&
ClientSideDetectionService* csd_service =
delegate_->GetClientSideDetectionServiceIfExists(browser_context);
- if (IsSafeBrowsingEnabled(*prefs) &&
+ if (false &&
BrowserProcess::GetInstance()->GetSafeBrowsingService() &&
csd_service) {
delegate_->DoesSafeBrowsingServiceExist() && csd_service) {
safebrowsing_detection_host_ =
@@ -72,7 +67,7 @@ void SafeBrowsingTabObserver::UpdateSafe
static_cast<BrowserContextImpl*>(web_contents_->GetBrowserContext());
PrefService* prefs = browser_context->pref_service();
- bool safe_browsing = safe_browsing::IsSafeBrowsingEnabled(*prefs);
delegate_->CreateClientSideDetectionHost(web_contents);
@@ -62,7 +57,7 @@ void SafeBrowsingTabObserver::UpdateSafe
#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
auto* browser_context = web_contents_->GetBrowserContext();
PrefService* prefs = delegate_->GetPrefs(browser_context);
- bool safe_browsing = IsSafeBrowsingEnabled(*prefs);
+ bool safe_browsing = false;
safe_browsing:: ClientSideDetectionService* csd_service =
ClientSideDetectionServiceFactory::GetForBrowserContext (browser_context);
ClientSideDetectionService* csd_service =
delegate_->GetClientSideDetectionServiceIfExists (browser_context);
if (safe_browsing && csd_service) {
@@ -89,4 +84,4 @@ void SafeBrowsingTabObserver::UpdateSafe
WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingTabObserver)
-} // namespace weblayer
\ No newline at end of file
+} // namespace weblayer
--- a/weblayer/browser/safe_browsing/client_side_detection_service_delegate.cc
+++ b/weblayer/browser/safe_browsing/client_side_detection_service_delegate.cc
@@ -37,22 +37,12 @@ scoped_refptr<network::SharedURLLoaderFa
ClientSideDetectionServiceDelegate::GetSafeBrowsingURLLoaderFactory() {
SafeBrowsingService* sb_service =
BrowserProcess::GetInstance()->GetSafeBrowsingService();
- return sb_service ? sb_service->GetURLLoaderFactory() : nullptr;
+ return nullptr;
}
--- a/components/safe_browsing/content/browser/user_population.cc
+++ b/components/safe_browsing/content/browser/user_population.cc
@@ -26,14 +26,6 @@ ChromeUserPopulation GetUserPopulation(
ChromeUserPopulation population;
safe_browsing::ChromeUserPopulation
ClientSideDetectionServiceDelegate::GetUserPopulation() {
safe_browsing::ChromeUserPopulation population;
- if (safe_browsing::IsEnhancedProtectionEnabled(*GetPrefs())) {
- population.set_user_population(
- safe_browsing::ChromeUserPopulation::ENHANCED_PROTECTION);
- } else if (safe_browsing::IsExtendedReportingEnabled(*GetPrefs())) {
- population.set_user_population(
- safe_browsing::ChromeUserPopulation::EXTENDED_REPORTING);
- } else if (safe_browsing::IsSafeBrowsingEnabled(*GetPrefs())) {
- population.set_user_population(
- safe_browsing::ChromeUserPopulation::SAFE_BROWSING);
- }
population.set_profile_management_status(
safe_browsing::ChromeUserPopulation::UNAVAILABLE);
if (prefs) {
- if (IsEnhancedProtectionEnabled(*prefs)) {
- population.set_user_population(ChromeUserPopulation::ENHANCED_PROTECTION);
- } else if (IsExtendedReportingEnabled(*prefs)) {
- population.set_user_population(ChromeUserPopulation::EXTENDED_REPORTING);
- } else if (IsSafeBrowsingEnabled(*prefs)) {
- population.set_user_population(ChromeUserPopulation::SAFE_BROWSING);
- }
-
population.set_is_mbb_enabled(prefs->GetBoolean(
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled));
}
--- a/weblayer/browser/tab_impl.cc
+++ b/weblayer/browser/tab_impl.cc
@@ -264,7 +264 ,7 @@ class WebContentsTracker : public conten
@@ -267,7 +267,7 @@ class WebContentsTracker : public conten
// available. Otherwise returns nullptr.
const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
GetDatabaseManagerFromSafeBrowsingService() {
@ -1364,23 +1349,30 @@ Subject: Fix build error caused by the removal of safe_browsing
+#if 0
SafeBrowsingService* safe_browsing_service =
BrowserProcess::GetInstance()->GetSafeBrowsingService();
return safe_browsing_service
--- a/weblayer/browser/safe_browsing/real_time_url_lookup_service_factory.cc
+++ b/weblayer/browser/safe_browsing/real_time_url_lookup_service_factory.cc
@@ -59,12 +59,7 @@ KeyedService* RealTimeUrlLookupServiceFa
PrefService* pref_service =
static_cast<BrowserContextImpl*>(context)->pref_service();
user_population.set_user_population(
- safe_browsing::IsEnhancedProtectionEnabled(*pref_service)
- ? safe_browsing::ChromeUserPopulation::ENHANCED_PROTECTION
- : safe_browsing::IsExtendedReportingEnabled(*pref_service)
- ? safe_browsing::ChromeUserPopulation::
- EXTENDED_REPORTING
- : safe_browsing::ChromeUserPopulation::SAFE_BROWSING);
+ safe_browsing::ChromeUserPopulation::SAFE_BROWSING);
user_population.set_profile_management_status(
safe_browsing::GetProfileManagementStatus(nullptr));
return scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>(
@@ -402,22 +402,8 @@ TabImpl::TabImpl(ProfileImpl* profile,
TrustedCDNObserver::CreateForWebContents(web_contents_.get());
- if (base::FeatureList::IsEnabled(
- features::kWebLayerClientSidePhishingDetection)) {
- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(
- web_contents_.get(),
- std::make_unique<WebLayerSafeBrowsingTabObserverDelegate>());
- }
-
auto* browser_context =
static_cast<BrowserContextImpl*>(web_contents_->GetBrowserContext());
- safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
- web_contents_.get(),
- HostContentSettingsMapFactory::GetForBrowserContext(browser_context),
- SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext(
- browser_context),
- browser_context->pref_service(),
- BrowserProcess::GetInstance()->GetSafeBrowsingService());
#endif
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
--- a/weblayer/browser/safe_browsing/client_side_detection_service_factory.cc
+++ b/weblayer/browser/safe_browsing/client_side_detection_service_factory.cc
@@ -45,9 +45,7 @@ ClientSideDetectionServiceFactory::~Clie
@ -1388,7 +1380,7 @@ Subject: Fix build error caused by the removal of safe_browsing
KeyedService* ClientSideDetectionServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
- return new safe_browsing::ClientSideDetectionService(
- std::make_unique<ClientSideDetectionServiceDelegate>(
- std::make_unique<WebLayer ClientSideDetectionServiceDelegate>(
- static_cast<BrowserContextImpl*>(context)));
+ return nullptr;
}
@ -1404,3 +1396,83 @@ Subject: Fix build error caused by the removal of safe_browsing
namespace safe_browsing {
const size_t kAdSamplerTriggerDefaultQuota = 10;
--- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
+++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
@@ -179,12 +179,6 @@ void PPAPIDownloadRequest::SendRequest()
DCHECK_CURRENTLY_ON(BrowserThread::UI);
ClientDownloadRequest request;
- auto population = is_enhanced_protection_
- ? ChromeUserPopulation::ENHANCED_PROTECTION
- : is_extended_reporting_
- ? ChromeUserPopulation::EXTENDED_REPORTING
- : ChromeUserPopulation::SAFE_BROWSING;
- request.mutable_population()->set_user_population(population);
request.mutable_population()->set_profile_management_status(
GetProfileManagementStatus(
g_browser_process->browser_policy_connector()));
--- a/weblayer/browser/safe_browsing/weblayer_client_side_detection_service_delegate.cc
+++ b/weblayer/browser/safe_browsing/weblayer_client_side_detection_service_delegate.cc
@@ -37,9 +37,7 @@ WebLayerClientSideDetectionServiceDelega
scoped_refptr<network::SharedURLLoaderFactory>
WebLayerClientSideDetectionServiceDelegate::GetSafeBrowsingURLLoaderFactory() {
- SafeBrowsingService* sb_service =
- BrowserProcess::GetInstance()->GetSafeBrowsingService();
- return sb_service->GetURLLoaderFactory();
+ return nullptr;
}
safe_browsing::ChromeUserPopulation
--- a/weblayer/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.cc
+++ b/weblayer/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.cc
@@ -37,8 +37,7 @@ KeyedService*
SafeBrowsingNavigationObserverManagerFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
BrowserContextImpl* context_impl = static_cast<BrowserContextImpl*>(context);
- return new safe_browsing::SafeBrowsingNavigationObserverManager(
- context_impl->pref_service());
+ return nullptr;
}
content::BrowserContext*
--- a/weblayer/browser/safe_browsing/weblayer_client_side_detection_host_delegate.cc
+++ b/weblayer/browser/safe_browsing/weblayer_client_side_detection_host_delegate.cc
@@ -37,14 +37,14 @@ scoped_refptr<safe_browsing::SafeBrowsin
WebLayerClientSideDetectionHostDelegate::GetSafeBrowsingDBManager() {
SafeBrowsingService* sb_service =
BrowserProcess::GetInstance()->GetSafeBrowsingService();
- return sb_service->GetSafeBrowsingDBManager();
+ return nullptr;
}
scoped_refptr<safe_browsing::BaseUIManager>
WebLayerClientSideDetectionHostDelegate::GetSafeBrowsingUIManager() {
SafeBrowsingService* sb_service =
BrowserProcess::GetInstance()->GetSafeBrowsingService();
- return sb_service->GetSafeBrowsingUIManager();
+ return nullptr;
}
safe_browsing::ClientSideDetectionService*
--- a/weblayer/browser/safe_browsing/weblayer_safe_browsing_tab_observer_delegate.cc
+++ b/weblayer/browser/safe_browsing/weblayer_safe_browsing_tab_observer_delegate.cc
@@ -24,17 +24,7 @@ std::unique_ptr<safe_browsing::ClientSid
CreateClientSideDetectionHost(content::WebContents* web_contents,
PrefService* prefs,
BrowserContextImpl* browser_context) {
- return safe_browsing::ClientSideDetectionHost::Create(
- web_contents,
- std::make_unique<WebLayerClientSideDetectionHostDelegate>(web_contents),
- prefs,
- std::make_unique<SafeBrowsingTokenFetcherImpl>(base::BindRepeating(
- &ProfileImpl::access_token_fetch_delegate,
- base::Unretained(ProfileImpl::FromBrowserContext(browser_context)))),
- static_cast<BrowserContextImpl*>(browser_context)->IsOffTheRecord(),
- /* account_signed_in_callback= */ base::BindRepeating([]() {
- return true;
- }));
+ return nullptr;
}
} // namespace
