[AiS] Enable AiS flag on all platforms

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 493292a58c868c6b2969e20d20ef23176605d4a7..c5d56ca2bff14937d8e6c58153aafe2047e93fb9 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -84,9 +84,7 @@ const char kGoogleRLZParameter[] = "google:RLZ";
 const char kGoogleSearchClient[] = "google:searchClient";
 const char kGoogleSearchFieldtrialParameter[] =
     "google:searchFieldtrialParameter";
-#if defined (OS_ANDROID)
 const char kGoogleSearchVersion[] = "google:searchVersion";
-#endif
 const char kGoogleSessionToken[] = "google:sessionToken";
 const char kGoogleSourceIdParameter[] = "google:sourceId";
 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
@@ -605,13 +603,9 @@ bool TemplateURLRef::ParseParameter(size_t start,
     replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start));
   } else if (parameter == kGoogleSearchFieldtrialParameter) {
     replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
-#if defined(OS_ANDROID)
   } else if (parameter == kGoogleSearchVersion) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableAnswersInSuggest)) {
+    if (chrome::IsAnswersInSuggestEnabled())
       url->insert(start, "gs_rn=42&");
-    }
-#endif
   } else if (parameter == kGoogleSessionToken) {
     replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start));
   } else if (parameter == kGoogleSourceIdParameter) {