Make the Location is Allowed link take the Geo Header into account.

chrome/browser/search_engines/template_url_service_android.cc

Index: chrome/browser/search_engines/template_url_service_android.cc
diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc
index 7b64168fc9f6388e58c970dfd6ac0fb85efb5cb4..ec59259746309745e1505452e2196b8b54a8d36d 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -253,7 +253,7 @@ TemplateUrlServiceAndroid::GetSearchEngineUrlFromTemplateUrl(
   TemplateURL* template_url = template_url_service_->GetTemplateURLs()[index];
   std::string url(template_url->url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(
-          base::string16()), SearchTermsData(), nullptr));
+          base::ASCIIToUTF16("query")), SearchTermsData(), nullptr));

[newt (away), 2015/04/28 06:44:01]

why/is this needed?

[Finnur, 2015/04/29 14:54:09]

Yes, it is needed. Maria and I have been discussing this back and forth. The net
of it is: This function's purpose is to return a URL that is representative of a
search query. An example if you will. Before this CL, we only used the URL to
get the scheme and host name for search queries and we didn't care about the
rest. Now, however, we also use the URL to see if a query URL will have location
info sent via x-geo. So the URL passes through the normal x-geo checks, but one
of the checks it uses is to see if the url is a valid search url (see
google_util's IsGoogleSearchUrl). That function returns false for search URLs
that are missing the query part, as it considers it invalid. The end result of
that would be my code thinking x-geo will not be used, when in fact it will be.

The fix is to make the example URL returned be a valid search URL (with the
query part) and then we can pass it through the x-geo checks and get an answer
that matches the answer that the Omnibox gets when asking if x-geo should be
used.

   return base::android::ConvertUTF8ToJavaString(env, url);
 }