[Preferences] Change a preference from Integer to String

kContextualSearchEnabled should be a string instead of an integer, to be consistent with the calling code.

This pref was never set (ever!) on people's profiles, only registered in profile.cc. I verified with gab@ that moving to String at this point will not mess things up.

BUG=341761
R=noms@chromium.org

Review URL: https://codereview.chromium.org/386893003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282667 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/profiles/profile.cc

@@ -70,9 +70,9 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #if defined(OS_ANDROID)
-  registry->RegisterIntegerPref(
+  registry->RegisterStringPref(
       prefs::kContextualSearchEnabled,
-      0,
+      std::string(),
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #endif
   registry->RegisterBooleanPref(

chrome/common/pref_names.cc

@@ -325,10 +325,10 @@ const char kIncognitoModeAvailability[] = "incognito.mode_availability";
 const char kSearchSuggestEnabled[] = "search.suggest_enabled";
 
 #if defined(OS_ANDROID)
-// Integer indicating the Contextual Search enabled state.
-// -1 - opt-out (disabled)
-//  0 - undecided
-//  1 - opt-in (enabled)
+// String indicating the Contextual Search enabled state.
+// "false" - opt-out (disabled)
+// "" (empty string) - undecided
+// "true" - opt-in (enabled)
 const char kContextualSearchEnabled[] = "search.contextual_search_enabled";
 #endif