DO NOT CHECK IN

components/omnibox/omnibox_field_trial.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 "components/omnibox/omnibox_field_trial.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 295 matching lines @@
       kHQPAllowMatchInSchemeRule) == "true";
 }
 
 bool OmniboxFieldTrial::DisableInlining() {
   return variations::GetVariationParamValue(
       kBundledExperimentFieldTrialName,
       kDisableInliningRule) == "true";
 }
 
 bool OmniboxFieldTrial::EnableAnswersInSuggest() {
-  const CommandLine* cl = CommandLine::ForCurrentProcess();
-  if (cl->HasSwitch(switches::kDisableAnswersInSuggest))
-    return false;
-  if (cl->HasSwitch(switches::kEnableAnswersInSuggest))
-    return true;
-
-  return variations::GetVariationParamValue(
-      kBundledExperimentFieldTrialName,
-      kAnswersInSuggestRule) == "true";
+  return true;
 }
 
 bool OmniboxFieldTrial::AddUWYTMatchEvenIfPromotedURLs() {
   return variations::GetVariationParamValue(
       kBundledExperimentFieldTrialName,
       kAddUWYTMatchEvenIfPromotedURLsRule) == "true";
 }
 
 bool OmniboxFieldTrial::DisplayHintTextWhenPossible() {
   return variations::GetVariationParamValue(
@@ skipping 91 matching lines @@
   if (it != params.end())
     return it->second;
   // Fall back to the global instant extended context.
   it = params.find(rule + ":" + page_classification_str + ":*");
   if (it != params.end())
     return it->second;
   // Look up rule in the global context.
   it = params.find(rule + ":*:*");
   return (it != params.end()) ? it->second : std::string();
 }