diff options
| author | noelutz@google.com <noelutz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 22:08:11 +0000 |
|---|---|---|
| committer | noelutz@google.com <noelutz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 22:08:11 +0000 |
| commit | 436ebd66b780010faf83138dd8019efc4d0e1c2a (patch) | |
| tree | 234ef72b0da8d854de84b6f2e4d3a8d05dc15522 /chrome | |
| parent | 8c664372f6360afe448feb1e8012ff27ee8cc02a (diff) | |
| download | chromium_src-436ebd66b780010faf83138dd8019efc4d0e1c2a.zip chromium_src-436ebd66b780010faf83138dd8019efc4d0e1c2a.tar.gz chromium_src-436ebd66b780010faf83138dd8019efc4d0e1c2a.tar.bz2 | |
Enable client-side phishing detection for stable builds.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6995092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 80e87c6..136e0b5 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -41,7 +41,6 @@ #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/notifications/notification_ui_manager.h" -#include "chrome/browser/platform_util.h" #include "chrome/browser/plugin_data_remover.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/prefs/browser_prefs.h" @@ -1009,22 +1008,15 @@ 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. - // For now we only enable client-side detection on the canary, dev and beta - // channel. + // not disabled and when safe browsing related stats are allowed to be + // collected. #ifdef OS_CHROMEOS return false; #else - std::string channel = platform_util::GetVersionStringModifier(); return !CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableClientSidePhishingDetection) && safe_browsing_service() && - safe_browsing_service()->CanReportStats() && - // TODO(noelutz): use platform_util::GetChannel() once it has been - // pushed to the release branch. - (channel == "beta" || channel == "dev" || channel == "canary" || - channel == "beta-m" || channel == "dev-m" || channel == "canary-m"); - + safe_browsing_service()->CanReportStats(); #endif } |