| Index: chrome/browser/autocomplete/search_provider.cc
|
| diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
|
| index d6979a84f22ccc118ebf23cbd2104ee1af271486..528cde1dd2d0c16983e81b7b82cd7bba4f4a6b32 100644
|
| --- a/chrome/browser/autocomplete/search_provider.cc
|
| +++ b/chrome/browser/autocomplete/search_provider.cc
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/base64.h"
|
| #include "base/callback.h"
|
| -#include "base/command_line.h"
|
| #include "base/i18n/break_iterator.h"
|
| #include "base/i18n/case_conversion.h"
|
| #include "base/json/json_string_value_serializer.h"
|
| @@ -37,7 +36,6 @@
|
| #include "chrome/browser/search_engines/template_url_service.h"
|
| #include "chrome/browser/search_engines/template_url_service_factory.h"
|
| #include "chrome/browser/ui/search/instant_controller.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/user_metrics.h"
|
| @@ -641,11 +639,8 @@ net::URLFetcher* SearchProvider::CreateSuggestFetcher(
|
| TemplateURLRef::SearchTermsArgs search_term_args(input.text());
|
| search_term_args.cursor_position = input.cursor_position();
|
| search_term_args.page_classification = input.current_page_classification();
|
| -#if defined(OS_ANDROID)
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableAnswersInSuggest))
|
| + if (chrome::IsAnswersInSuggestEnabled())
|
| search_term_args.session_token = GetSessionToken();
|
| -#endif
|
| GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms(
|
| search_term_args));
|
| if (!suggest_url.is_valid())
|
|
|