[Mobile] Upstream fix for yandex search engine

components/search_engines/template_url.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/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 85 matching lines @@
 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
 const char kGoogleSuggestClient[] = "google:suggestClient";
 const char kGoogleSuggestRequestId[] = "google:suggestRid";
 
 // Same as kSearchTermsParameter, with no escaping.
 const char kGoogleUnescapedSearchTermsParameter[] =
     "google:unescapedSearchTerms";
 const char kGoogleUnescapedSearchTermsParameterFull[] =
     "{google:unescapedSearchTerms}";
 
+// Yandex reported that mobile should use a different path for the search
+// to avoid one additional redirect, this is used to encode the path in
+// the URL template.
+const char kYandexSearchPathParameter[] = "yandex:searchPath";

[Peter Kasting, 2015/05/13 22:56:55]

I'm not a fan of the ton of constants we have up here that are only ever used
once, since it's not clear that their scope is actually very narrow; and the
constant names add nothing to the actual string values.

Can you inline this into the code that uses it below?  Added bonus for inlining
any other constants up here that are in a similar situation.

[sdefresne, 2015/05/18 12:35:45]

Done. Followup CL https://codereview.chromium.org/1146673002/ to inline the
other constants (and get the bonus points).

+
 // Display value for kSearchTermsParameter.
 const char kDisplaySearchTerms[] = "%s";
 
 // Display value for kGoogleUnescapedSearchTermsParameter.
 const char kDisplayUnescapedSearchTerms[] = "%S";
 
 // Used if the count parameter is not optional. Indicates we want 10 search
 // results.
 const char kDefaultCount[] = "10";
 
@@ skipping 563 matching lines @@
 #endif
   } else if (parameter == kGoogleSuggestAPIKeyParameter) {
     url->insert(start,
                 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false));
   } else if (parameter == kGoogleSuggestClient) {
     replacements->push_back(Replacement(GOOGLE_SUGGEST_CLIENT, start));
   } else if (parameter == kGoogleSuggestRequestId) {
     replacements->push_back(Replacement(GOOGLE_SUGGEST_REQUEST_ID, start));
   } else if (parameter == kGoogleUnescapedSearchTermsParameter) {
     replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
+  } else if (parameter == kYandexSearchPathParameter) {
+#if defined(OS_ANDROID) || defined(OS_IOS)

[Peter Kasting, 2015/05/13 22:56:55]

Is OS_ANDROID correct here for tablets running Android?

[sdefresne, 2015/05/18 12:35:45]

I've tested and tablet are redirected to "padsearch" when using either of
"yandsearch" or "touchsearch" (both on android and iOS) so I've updated the CL
to check for the device form factor to decide which tarm to use.

+    url->insert(start, "touchsearch");
+#else
+    url->insert(start, "yandsearch");
+#endif
   } else if (parameter == kInputEncodingParameter) {
     replacements->push_back(Replacement(ENCODING, start));
   } else if (parameter == kLanguageParameter) {
     replacements->push_back(Replacement(LANGUAGE, start));
   } else if (parameter == kOutputEncodingParameter) {
     if (!optional)
       url->insert(start, kOutputEncodingType);
   } else if ((parameter == kStartIndexParameter) ||
              (parameter == kStartPageParameter)) {
     // We don't support these.
@@ skipping 844 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }