[Android] Simplify logic for grabbing initial country-code.

components/search_engines/template_url_prepopulate_data.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
 
 #include <stddef.h>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 struct TemplateURLData;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace TemplateURLPrepopulateData {
 
 extern const int kMaxPrepopulatedEngineID;
 
-#if defined(OS_ANDROID)
-// This must be called early only once. |country_code| is the country code at
-// install following the ISO-3166 specification.
-void InitCountryCode(const std::string& country_code);
-#endif
-
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
 // Returns the current version of the prepopulate data, so callers can know when
 // they need to re-merge. If the prepopulate data comes from the preferences
 // file then it returns the version specified there.
 int GetDataVersion(PrefService* prefs);
 
 // Loads the set of TemplateURLs from the prepopulate data. On return,
 // |default_search_provider_index| is set to the index of the default search
 // provider.
@@ skipping 19 matching lines @@
 SearchEngineType GetEngineType(const TemplateURL& template_url,
                                const SearchTermsData& search_terms_data);
 
 // Like the above, but takes a GURL which is expected to represent a search URL.
 // This may be called on any thread.
 SearchEngineType GetEngineType(const GURL& url);
 
 }  // namespace TemplateURLPrepopulateData
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_