Add API key to omnibox's suggest requests

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index ad96e0e24ed19d7c099a93a3ff2513adce567214..d6a4dea51a4268d53f9e4c6983f19686dd44a5ac 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/url_constants.h"
+#include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -57,6 +58,7 @@ const char kGoogleRLZParameter[] = "google:RLZ";
 // Same as kSearchTermsParameter, with no escaping.
 const char kGoogleSearchFieldtrialParameter[] =
     "google:searchFieldtrialParameter";
+const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
 const char kGoogleUnescapedSearchTermsParameter[] =
     "google:unescapedSearchTerms";
 const char kGoogleUnescapedSearchTermsParameterFull[] =
@@ -284,6 +286,11 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData(
         }
         break;
 
+      case GOOGLE_SUGGEST_API_KEY:
+        url.insert(i->index, "sugkey=" +

[David Black, 2012/09/14 19:05:05]

It looks like you're confusing the approaches taken here for optional vs
always-present cgi parameters.  Always-present params have their "&foo=" part
inline in template_url_prepopulate_data.cc and just stick the value in here,
like case SEARCH_TERMS.  Optional params, like GOOGLE_SEARCH_FIELDTRIAL_GROUP,
keep everything here because they've got an if statement around 'em.  Either
surround this logic with an if(google_apis::GetAPIKey()) or move the "sugkey="
part into template_url_prepopulate_data.cc.

(Also these urls aren't user visible so cgi param ordering shouldn't matter.)

[Mark P, 2012/09/14 19:20:34]

Good idea.  Did the latter.

+            net::EscapeQueryParamValue(google_apis::GetAPIKey(), false) + "&");
+        break;
+
       case GOOGLE_UNESCAPED_SEARCH_TERMS: {
         std::string unescaped_terms;
         base::UTF16ToCodepage(search_terms_args.search_terms,
@@ -462,6 +469,8 @@ bool TemplateURLRef::ParseParameter(size_t start,
     replacements->push_back(Replacement(GOOGLE_RLZ, start));
   } else if (parameter == kGoogleSearchFieldtrialParameter) {
     replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
+  } else if (parameter == kGoogleSuggestAPIKeyParameter) {
+    replacements->push_back(Replacement(GOOGLE_SUGGEST_API_KEY, start));
   } else if (parameter == kGoogleUnescapedSearchTermsParameter) {
     replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
   } else if (!prepopulated_) {