[AiS] Command-line flag and field trial changes.

chrome/browser/search_engines/ui_thread_search_terms_data.cc

Index: chrome/browser/search_engines/ui_thread_search_terms_data.cc
diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
index e3b29f1ea0f64c504d0e775af6d37e9a7f17e76c..bc0eb66877c9062f56ee7920fd54e4922bcf715c 100644
--- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc
+++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_profile_helper.h"
+#include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sync/glue/device_info.h"
@@ -114,12 +115,8 @@ std::string UIThreadSearchTermsData::GetSuggestRequestIdentifier() const {
   sync_pb::SyncEnums::DeviceType device_type =
       browser_sync::DeviceInfo::GetLocalDeviceType();
   if (device_type == sync_pb::SyncEnums_DeviceType_TYPE_PHONE) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableAnswersInSuggest)) {
-      return "chrome-mobile-ext-ansg";
-    } else {
-      return "chrome-mobile-ext";
-    }
+    return OmniboxFieldTrial::EnableAnswersInSuggest() ?
+        "chrome-mobile-ext-ansg" : "chrome-mobile-ext";
   }
   return "chrome-ext";
 #else