Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index f1767ec36cdba33f90c7fef7081437fbd3a4f539..95ce36e55390f4cd234a2a8b1338dfaa15fa5d5c 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -834,11 +834,10 @@ void ProfileImpl::OnPrefsLoaded(bool success) { |
// TODO(sky): remove this in a couple of releases (m28ish). |
prefs_->SetBoolean(prefs::kSessionExitedCleanly, true); |
-#if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING) |
- // Clear safe browsing setting in the case we need to roll back |
- // for users enrolled in Finch trial before. |
Nico
2015/05/13 00:07:23
Why do you no longer need the field trial?
Nathan Parker
2015/05/13 00:11:23
The field trial was used last Fall to test full Sa
|
- if (!SafeBrowsingService::IsEnabledByFieldTrial()) |
- prefs_->ClearPref(prefs::kSafeBrowsingEnabled); |
+#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); |