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

chrome/browser/search/search.cc

 // Copyright 2012 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/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_iterator.h"
@@ skipping 585 matching lines @@
 GURL GetLocalInstantURL(Profile* profile) {
   return GURL(chrome::kChromeSearchLocalNtpUrl);
 }
 
 bool ShouldHideTopVerbatimMatch() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kHideVerbatimFlagName, false, flags);
 }
 
+bool IsAnswersInSuggestEnabled() {

[Mark P, 2014/06/19 23:50:21]

This  code should not go here.  search.cc is basically entirely about the
EmbeddedSearch field trial.  Put this in omnibox_field_trial.

[Justin Donnelly, 2014/06/20 00:39:20]

Done.

+  const CommandLine* cl = CommandLine::ForCurrentProcess();
+  if (cl->HasSwitch(switches::kDisableAnswersInSuggest))
+    return false;
+  if (cl->HasSwitch(switches::kEnableAnswersInSuggest))
+    return true;
+
+  return OmniboxFieldTrial::EnableAnswersInSuggest();
+}
+
 DisplaySearchButtonConditions GetDisplaySearchButtonConditions() {
   const CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kDisableSearchButtonInOmnibox))
     return DISPLAY_SEARCH_BUTTON_NEVER;
   if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxForStr))
     return DISPLAY_SEARCH_BUTTON_FOR_STR;
   if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxForStrOrIip))
     return DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP;
   if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxAlways))
     return DISPLAY_SEARCH_BUTTON_ALWAYS;
@@ skipping 197 matching lines @@
 
 // Given a FieldTrialFlags object, returns the boolean value of the provided
 // flag.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags) {
   return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
 }
 
 }  // namespace chrome