Index: chrome/browser/browser_process_impl.cc |
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc |
index 89ea85a4a76fcd9481f58481943f5d9d5e45b01d..a1bd548484d665b56c415a12108f956a13612257 100644 |
--- a/chrome/browser/browser_process_impl.cc |
+++ b/chrome/browser/browser_process_impl.cc |
@@ -935,10 +935,14 @@ void BrowserProcessImpl::CreateSafeBrowsingDetectionService() { |
bool BrowserProcessImpl::IsSafeBrowsingDetectionServiceEnabled() { |
// The safe browsing client-side detection is enabled only if the switch is |
// enabled and when safe browsing related stats is allowed to be collected. |
- return CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableClientSidePhishingDetection) && |
+#ifdef OS_CHROMEOS |
+ return false; |
+#else |
+ return !CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDisableClientSidePhishingDetection) && |
resource_dispatcher_host()->safe_browsing_service() && |
resource_dispatcher_host()->safe_browsing_service()->CanReportStats(); |
+#endif |
} |
// The BrowserProcess object must outlive the file thread so we use traits |