Getting answer server URL from the variations server.

ui/app_list/app_list_switches.cc

Index: ui/app_list/app_list_switches.cc
diff --git a/ui/app_list/app_list_switches.cc b/ui/app_list/app_list_switches.cc
index c583832888b98b9b0fdb8fb5893c7dc800f2dd4e..c845b3f538b8e7db63041b052ba05cda7945f962 100644
--- a/ui/app_list/app_list_switches.cc
+++ b/ui/app_list/app_list_switches.cc
@@ -5,6 +5,7 @@
 #include "ui/app_list/app_list_switches.h"
 
 #include "base/command_line.h"
+#include "base/metrics/field_trial_params.h"
 #include "build/build_config.h"
 
 namespace app_list {
@@ -79,12 +80,19 @@ bool IsDriveSearchInChromeLauncherEnabled() {
 }
 
 std::string AnswerServerUrl() {
-  return base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
-      kAnswerServerUrl);
+  // If the answer server URL is passed in the command line, use it, otherwise
+  // get it from the variations server.
+  const std::string variations_url = base::GetFieldTrialParamValue(
+      "SearchAnswerCard", switches::kAnswerServerUrl);
+  const std::string url =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
+          kAnswerServerUrl);
+  return !url.empty() ? url : variations_url;
 }
 
 bool IsAnswerCardEnabled() {
-  return !AnswerServerUrl().empty();
+  static const bool enabled = !AnswerServerUrl().empty();
+  return enabled;
 }
 
 }  // namespace switches