apply suggestions

From: uazo <uazo@users.noreply.github.com>

Date: Sun, 6 Sep 2020 11:53:15 +0000

From: root <root@ubuntu.cabponte>

Date: Sun, 6 Sep 2020 14:50:37 +0000

Subject: remove aqs and other parameters from search urls

---

 components/search_engines/template_url.cc | 17 -----------------

 1 file changed, 17 deletions(-)

 components/search_engines/template_url.cc | 19 -------------------

 1 file changed, 19 deletions(-)

diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc

--- a/components/search_engines/template_url.cc

   } else if (parameter == "google:contextualSearchVersion") {

     replacements->push_back(

         Replacement(GOOGLE_CONTEXTUAL_SEARCH_VERSION, start));

@@ -688,26 +681,18 @@ bool TemplateURLRef::ParseParameter(size_t start,

@@ -688,27 +681,17 @@ bool TemplateURLRef::ParseParameter(size_t start,

     replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,

                                         start));

   } else if (parameter == "google:pageClassification") {

   } else if (parameter == "google:sessionToken") {

-    replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start));

   } else if (parameter == "google:sourceId") {

 #if defined(OS_ANDROID) || defined(OS_IOS)

-#if defined(OS_ANDROID) || defined(OS_IOS)

-    url->insert(start, "sourceid=chrome-mobile&");

 #else

-    url->insert(start, "sourceid=chrome&");

 #endif

-#else

     url->insert(start, "sourceid=chrome&");

-#endif

   } else if (parameter == "google:suggestAPIKeyParameter") {

     url->insert(start,

@@ -719,9 +704,7 @@ bool TemplateURLRef::ParseParameter(size_t start,

                 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false));

@@ -719,9 +702,7 @@ bool TemplateURLRef::ParseParameter(size_t start,

   } else if (parameter == kGoogleUnescapedSearchTermsParameter) {

     replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));

   } else if (parameter == "yandex:referralID") {