Fix TemplateURLFetcherTest.* for Android.

chrome/browser/search_engines/template_url_service_test_util.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_service_test_util.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #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 {
 
 // A callback used to coordinate when the database has finished processing
 // requests. See note in BlockTillServiceProcessesRequests for details.
 //
 // Schedules a QuitClosure on the message loop it was created with.
 void QuitCallback(MessageLoop* message_loop) {
   message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ skipping 71 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestingTemplateURLService);
 };
 
 void TemplateURLServiceTestingProfile::SetUp() {
   db_thread_.Start();
 
   // Make unique temp directory.
   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));
 }
 
 void TemplateURLServiceTestingProfile::TearDown() {
   // Clear the request context so it will get deleted. This should be done
   // before shutting down the I/O thread to avoid memory leaks.
   ResetRequestContext();
 
   // Wait for the delete of the request context to happen.
@@ skipping 180 matching lines @@
   return profile_.get();
 }
 
 void TemplateURLServiceTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }
 
 void TemplateURLServiceTestUtil::PumpLoop() {
   message_loop_.RunUntilIdle();
 }