Fix TemplateURLFetcherTest.* for Android.

chrome/browser/search_engines/template_url_service_test_util.cc

Index: chrome/browser/search_engines/template_url_service_test_util.cc
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index 356b05ae19555a99fcd11638e0dab05221234b59..41f1ebe3ba0ef446276bc872736041f23cfef1e8 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -23,6 +23,10 @@
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
@@ -114,6 +118,9 @@ void TemplateURLServiceTestingProfile::SetUp() {
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
   FilePath path = temp_dir_.path().AppendASCII("TestDataService.db");
+#if defined(OS_ANDROID)
+  TemplateURLPrepopulateData::InitCountryCode("US");

[sky, 2012/11/19 22:50:01]

This seems like a more fundamental problem. Shouldn't the InitCountryCode be
done in a more central location?

[michaelbai, 2012/11/19 23:05:38]

Did you mean TestingProfile?

On 2012/11/19 22:50:01, sky wrote:

[Peter Kasting, 2012/11/20 04:06:13]

Yes, but really this is just wrong anyway.  No tests should depend on this.

It looks to me like the Android code in template_url_prepopulate_data.cc should
simply remove the entire concept of kCountryIDNotSet, init
g_country_code_at_install to kCountryIDUnknown, and not DCHECK in
GetCurrentCountryID.  That would mean the tests would run with the default
engine set, which is what we want.

[michaelbai, 2012/11/20 19:03:33]

It looks like the original author want to be warned if the InitCountryCode()
wasn't called. Actually, it works in unit tests :), I'd like to keep this and
make the unit tests passed with kCountryIDUnknown at the same time, sounds good?

On 2012/11/20 04:06:13, Peter Kasting wrote:

+#endif
   service_ = new WebDataService;
   ASSERT_TRUE(service_->InitWithPath(path));
 }