Enable Answers in Suggest always.

chrome/browser/search_engines/ui_thread_search_terms_data.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 100 matching lines @@
       "chrome" : "chrome-omni";
 #else
   return chrome::IsInstantExtendedAPIEnabled() ? "chrome-omni" : "chrome";
 #endif
 }
 
 std::string UIThreadSearchTermsData::GetSuggestRequestIdentifier() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_ANDROID)
   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE) {

[Peter Kasting, 2015/07/10 18:33:22]

Nit: Remove {}

[Justin Donnelly, 2015/07/10 19:15:03]

Done.

-    return OmniboxFieldTrial::EnableAnswersInSuggest() ?
-        "chrome-mobile-ext-ansg" : "chrome-mobile-ext";
+    return "chrome-mobile-ext-ansg";
   }
 #endif
-  return OmniboxFieldTrial::EnableAnswersInSuggest() ?
-      "chrome-ext-ansg" : "chrome-ext";
-}
-
-bool UIThreadSearchTermsData::EnableAnswersInSuggest() const {
-  return OmniboxFieldTrial::EnableAnswersInSuggest();
+  return "chrome-ext-ansg";
 }
 
 bool UIThreadSearchTermsData::IsShowingSearchTermsOnSearchResultsPages() const {
   return chrome::IsInstantExtendedAPIEnabled() &&
       chrome::IsQueryExtractionEnabled();
 }
 
 std::string UIThreadSearchTermsData::InstantExtendedEnabledParam(
     bool for_search) const {
   return chrome::InstantExtendedEnabledParam(for_search);
@@ skipping 44 matching lines @@
   if (!modifier.empty())
     version += " " + modifier;
   return version;
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }