[iOS] Expose TemplateURLPrepopulateData::GetCurrentCountryID()

components/search_engines/template_url_prepopulate_data.cc

Index: components/search_engines/template_url_prepopulate_data.cc
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 5d79f666321fd04b8d3af15f6f277e3923233f31..84ef52289e7b20fcd82b1e5924adfb6808fa85be 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -1277,4 +1277,12 @@ SearchEngineType GetEngineType(const GURL& url) {
   return SEARCH_ENGINE_OTHER;
 }
 
+#if defined(OS_IOS)
+
+int GetCurrentCountryID() {
+  return GetCountryIDFromPrefs(nullptr);

[Peter Kasting, 2015/05/12 18:49:13]

This infinite loops, doesn't it?  The first thing GetCountryIDFromPrefs() does
is call GetCurrentCountryID() when the arg is null.

[sdefresne, 2015/05/13 12:47:12]

No because there are two methods called GetCurrentCountryID. This one in
TemplateURLPrepopulateData and one in TemplateURLPrepopulateData::{anonymous
namespace}.

Since the method in the anonymous namespace has different implementation on each
architecture it is not easy to move it out of the anonymous namespace. I've
renamed the exported method to make it easier to understand.

+}
+
+#endif
+
 }  // namespace TemplateURLPrepopulateData