Index: chrome/browser/instant/instant_field_trial.cc |
diff --git a/chrome/browser/instant/instant_field_trial.cc b/chrome/browser/instant/instant_field_trial.cc |
index 0087b8b2a73156a1d457b6073cfb7253cf1df77b..83c60ec92a709eeb04404b8009dbf02efa05cf39 100644 |
--- a/chrome/browser/instant/instant_field_trial.cc |
+++ b/chrome/browser/instant/instant_field_trial.cc |
@@ -66,6 +66,11 @@ InstantFieldTrial::Group InstantFieldTrial::GetGroup(Profile* profile) { |
if (group == base::FieldTrial::kNotFinalized || group == g_inactive) |
return INACTIVE; |
+ // If Instant is already enabled explicitly, then it's not a field trial. |
+ const PrefService* prefs = profile ? profile->GetPrefs() : NULL; |
+ if (prefs && prefs->GetBoolean(prefs::kInstantEnabled)) |
+ return INACTIVE; |
+ |
// CONTROL and SILENT are unconstrained. |
if (group == g_control) |
return CONTROL; |
@@ -73,7 +78,6 @@ InstantFieldTrial::Group InstantFieldTrial::GetGroup(Profile* profile) { |
return SILENT; |
// HIDDEN, SUGGEST and INSTANT need non-incognito, suggest-enabled profiles. |
- const PrefService* prefs = profile ? profile->GetPrefs() : NULL; |
if (!prefs || profile->IsOffTheRecord() || |
!prefs->GetBoolean(prefs::kSearchSuggestEnabled)) { |
return INACTIVE; |