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
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 @@
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
}
