[iOS] Expose TemplateURLPrepopulateData::GetCurrentCountryID()

components/search_engines/template_url_prepopulate_data.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_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 1259 matching lines @@
     // Then check the alternate URLs.
     for (size_t j = 0; j < kAllEngines[i]->alternate_urls_size; ++j) {
       if (SameDomain(url, GURL(kAllEngines[i]->alternate_urls[j])))
         return kAllEngines[i]->type;
     }
   }
 
   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