Fix TemplateURLFetcherTest.* for Android.

chrome/browser/search_engines/template_url_prepopulate_data.cc

 // Copyright (c) 2012 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 "chrome/browser/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 508 matching lines @@
 
 
 // Geographic mappings /////////////////////////////////////////////////////////
 
 // Please refer to ISO 3166-1 for information about the two-character country
 // codes; http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 is useful. In the
 // following (C++) code, we pack the two letters of the country code into an int
 // value we call the CountryID.
 
 const int kCountryIDUnknown = -1;
-const int kCountryIDNotSet = 0;
 
 inline int CountryCharsToCountryID(char c1, char c2) {
   return c1 << 8 | c2;
 }
 
 int CountryCharsToCountryIDWithUpdate(char c1, char c2) {
   // SPECIAL CASE: In 2003, Yugoslavia renamed itself to Serbia and Montenegro.
   // Serbia and Montenegro dissolved their union in June 2006. Yugoslavia was
   // ISO 'YU' and Serbia and Montenegro were ISO 'CS'. Serbia was subsequently
   // issued 'RS' and Montenegro 'ME'. Windows XP and Mac OS X Leopard still use
@@ skipping 88 matching lines @@
   CFRange char_range = CFRangeMake(0, 2);
   CFStringGetCharacters(country, char_range, isobuf);
 
   return CountryCharsToCountryIDWithUpdate(static_cast<char>(isobuf[0]),
                                            static_cast<char>(isobuf[1]));
 }
 
 #elif defined(OS_ANDROID)
 
 // Initialized by InitCountryCode().
-int g_country_code_at_install = kCountryIDNotSet;
+int g_country_code_at_install = kCountryIDUnknown;
 
 int GetCurrentCountryID() {
-  DCHECK(g_country_code_at_install != kCountryIDNotSet);
   return g_country_code_at_install;
 }
 
+void InitCountryCode(const std::string& country_code) {
+  if (country_code.size() != 2) {
+    DLOG(ERROR) << "Invalid country code: " << country_code;
+    g_country_code_at_install = kCountryIDUnknown;
+  } else {
+    g_country_code_at_install =
+        CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
+  }
+}
+
 #elif defined(OS_POSIX)
 
 int GetCurrentCountryID() {
   const char* locale = setlocale(LC_MESSAGES, NULL);
 
   if (!locale)
     return kCountryIDUnknown;
 
   // The format of a locale name is:
   // language[_territory][.codeset][@modifier], where territory is an ISO 3166
@@ skipping 617 matching lines @@
 
 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
   if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
     return GURL((size == LOGO_200_PERCENT) ?
                 google_logos.logo_200_percent_url :
                 google_logos.logo_100_percent_url);
   }
   return GURL();
 }
 
-#if defined(OS_ANDROID)
-
-void InitCountryCode(const std::string& country_code) {
-  if (country_code.size() != 2) {
-    DLOG(ERROR) << "Invalid country code: " << country_code;
-    g_country_code_at_install = kCountryIDUnknown;
-  } else {
-    g_country_code_at_install =
-        CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
-  }
-}
-
-#endif
-
 }  // namespace TemplateURLPrepopulateData