summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Parker <nparker@chromium.org>2015-09-03 11:04:55 -0700
committerNathan Parker <nparker@chromium.org>2015-09-03 18:06:03 +0000
commit0693aabac7b87bcb8365c4028ea5fcf07c03110d (patch)
tree8078eb18c4728b349ea32660256fb35031b26e5f
parent67fda7b9d29bc6ba11f99ab5bde738a6b145b8d2 (diff)
downloadchromium_src-0693aabac7b87bcb8365c4028ea5fcf07c03110d.zip
chromium_src-0693aabac7b87bcb8365c4028ea5fcf07c03110d.tar.gz
chromium_src-0693aabac7b87bcb8365c4028ea5fcf07c03110d.tar.bz2
Remove hard-coded-on for Safe Browsing on Android.
BUG=527529 Review URL: https://codereview.chromium.org/1327873002 Cr-Commit-Position: refs/heads/master@{#347031} (cherry picked from commit 5759aac6726e984dcc2bd4d8f7b8bad1e4847508) Review URL: https://codereview.chromium.org/1318523008 . Cr-Commit-Position: refs/branch-heads/2490@{#149} Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
-rw-r--r--chrome/browser/profiles/profile_impl.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 172cf20..09dbefd 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -821,12 +821,6 @@ void ProfileImpl::OnLocaleReady() {
// TODO(sky): remove this in a couple of releases (m28ish).
prefs_->SetBoolean(prefs::kSessionExitedCleanly, true);
-#if defined(SAFE_BROWSING_DB_REMOTE)
- // Hardcode this pref on this build of Android until the UX is developed.
- // http://crbug.com/481558
- prefs_->SetBoolean(prefs::kSafeBrowsingEnabled, true);
-#endif
-
g_browser_process->profile_manager()->InitProfileUserPrefs(this);
{