Remove content->app dependency in template_url_prepopulate_data.cc.

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
 
 #include "base/command_line.h"
+#include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
@@ skipping 2693 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 87 matching lines @@
   UniChar isobuf[2];
   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 GetCurrentCountryID() {
-  const std::string country_code_at_install =
-      TemplateURLPrepopulateData::GetCountryCodeAtInstall();
-  return country_code_at_install.empty() ? kCountryIDUnknown :
-      CountryCharsToCountryIDWithUpdate(country_code_at_install[0],
-                                        country_code_at_install[1]);
+  DCHECK(g_country_code_at_install != kCountryIDNotSet);
+  return g_country_code_at_install;
 }
 
 #elif defined(OS_POSIX)
 
 int GetCurrentCountryID() {
   const char* locale = setlocale(LC_MESSAGES, NULL);
 
   if (!locale)
     return kCountryIDUnknown;
 
@@ skipping 590 matching lines @@
   GURL origin(as_gurl.GetOrigin());
   for (size_t i = 0; i < arraysize(kAllEngines); ++i) {
     GURL engine_url(kAllEngines[i]->search_url);
     if (engine_url.is_valid() && (origin == engine_url.GetOrigin()))
       return kAllEngines[i]->type;
   }
 
   return SEARCH_ENGINE_OTHER;
 }
 
+#if defined(OS_ANDROID)
+
+void InitCountryCode(const std::string& country_code) {
+  if (country_code.size() != 2) {
+    LOG(ERROR) << "Invalid country code: " << country_code;

[SteveT, 2012/07/05 13:38:28]

nit: Can we DVLOG instead? Or is this useful in release builds?

[Philippe, 2012/07/05 14:27:40]

We don't need that in release builds indeed. I made it DLOG(ERROR).

+    g_country_code_at_install = kCountryIDUnknown;
+  } else {
+    g_country_code_at_install =
+        CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
+  }
+}
+
+#endif
+
 }  // namespace TemplateURLPrepopulateData