Index: chrome/browser/search/instant_unittest_base.cc |
diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc |
index bd65fb9d7f0795a2a39b5d3b6734acd768c191fb..17cd80dbe224b8d6b4eaa650a74f5adf095ac1f7 100644 |
--- a/chrome/browser/search/instant_unittest_base.cc |
+++ b/chrome/browser/search/instant_unittest_base.cc |
@@ -33,8 +33,14 @@ InstantUnitTestBase::~InstantUnitTestBase() { |
} |
void InstantUnitTestBase::SetUp() { |
- search::EnableQueryExtractionForTesting(); |
- SetUpHelper(); |
+ BrowserWithTestWindowTest::SetUp(); |
+ |
+ template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile()); |
+ search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_); |
+ |
+ UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/"); |
+ SetUserSelectedDefaultSearchProvider("{google:baseURL}"); |
+ instant_service_ = InstantServiceFactory::GetForProfile(profile()); |
} |
void InstantUnitTestBase::TearDown() { |
@@ -42,12 +48,6 @@ void InstantUnitTestBase::TearDown() { |
BrowserWithTestWindowTest::TearDown(); |
} |
-#if !defined(OS_ANDROID) |
-void InstantUnitTestBase::SetUpWithoutQueryExtraction() { |
- SetUpHelper(); |
-} |
-#endif |
- |
void InstantUnitTestBase::SetUserSelectedDefaultSearchProvider( |
const std::string& base_url) { |
TemplateURLData data; |
@@ -88,14 +88,3 @@ TestingProfile* InstantUnitTestBase::CreateProfile() { |
profile, &TemplateURLServiceFactory::BuildInstanceFor); |
return profile; |
} |
- |
-void InstantUnitTestBase::SetUpHelper() { |
- BrowserWithTestWindowTest::SetUp(); |
- |
- template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile()); |
- search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_); |
- |
- UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/"); |
- SetUserSelectedDefaultSearchProvider("{google:baseURL}"); |
- instant_service_ = InstantServiceFactory::GetForProfile(profile()); |
-} |