Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/search_engines/template_url_service_unittest.cc

Issue 513133002: Move TemplateURLService related tests to components/search_engines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/search_engines/template_url_service_sync_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/search_engines/template_url_service_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/components/search_engines/template_url_service_unittest.cc
similarity index 94%
rename from chrome/browser/search_engines/template_url_service_unittest.cc
rename to components/search_engines/template_url_service_unittest.cc
index ffd3cb422d3c88ae1535bbe85ff475583d016ff0..b3909de351a7907931a8b39d3013fce66ced8db8 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/components/search_engines/template_url_service_unittest.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_test_util.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "components/search_engines/keyword_web_data_service.h"
#include "components/search_engines/search_host_to_urls_map.h"
@@ -26,7 +25,7 @@
#include "components/search_engines/template_url.h"
#include "components/search_engines/template_url_prepopulate_data.h"
#include "components/search_engines/template_url_service.h"
-#include "components/webdata/common/web_database.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::ASCIIToUTF16;
@@ -160,12 +159,14 @@ class TemplateURLServiceTest : public testing::Test {
// visually noisy in the test code.
void VerifyObserverCount(int expected_changed_count);
void VerifyObserverFired();
+ TemplateURLServiceTestUtil* test_util() { return test_util_.get(); }
TemplateURLService* model() { return test_util_->model(); }
const SearchTermsData& search_terms_data() {
return model()->search_terms_data();
}
- protected:
+ private:
+ content::TestBrowserThreadBundle thread_bundle_; // To set up BrowserThreads.
scoped_ptr<TemplateURLServiceTestUtil> test_util_;
DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTest);
@@ -263,12 +264,12 @@ void TemplateURLServiceTest::VerifyObserverFired() {
// Actual tests ---------------------------------------------------------------
TEST_F(TemplateURLServiceTest, Load) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
}
TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
// Add a new TemplateURL.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
const size_t initial_count = model()->GetTemplateURLs().size();
TemplateURLData data;
@@ -294,7 +295,7 @@ TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
// Reload the model to verify it was actually saved to the database.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
TemplateURL* loaded_url =
model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
@@ -322,7 +323,7 @@ TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
ASSERT_FALSE(model()->CanReplaceKeyword(ASCIIToUTF16("b"), GURL(), NULL));
cloned_url.reset(new TemplateURL(loaded_url->data()));
base::RunLoop().RunUntilIdle();
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
loaded_url = model()->GetTemplateURLForKeyword(ASCIIToUTF16("b"));
ASSERT_TRUE(loaded_url != NULL);
@@ -334,13 +335,13 @@ TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
// Remove an element and verify it succeeded.
model()->Remove(loaded_url);
VerifyObserverCount(1);
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_EQ(initial_count, model()->GetTemplateURLs().size());
EXPECT_TRUE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("b")) == NULL);
}
TEST_F(TemplateURLServiceTest, AddSameKeyword) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
AddKeywordWithDate(
"first", "keyword", "http://test1", std::string(), std::string(),
@@ -393,7 +394,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeyword) {
}
TEST_F(TemplateURLServiceTest, AddExtensionKeyword) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
TemplateURL* original1 = AddKeywordWithDate(
"replaceable", "keyword1", "http://test1", std::string(), std::string(),
@@ -434,7 +435,7 @@ TEST_F(TemplateURLServiceTest, AddExtensionKeyword) {
}
TEST_F(TemplateURLServiceTest, AddSameKeywordWithExtensionPresent) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Similar to the AddSameKeyword test, but with an extension keyword masking a
// replaceable TemplateURL. We should still do correct conflict resolution
@@ -479,7 +480,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeywordWithExtensionPresent) {
}
TEST_F(TemplateURLServiceTest, RestoreOmniboxExtensionKeyword) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Register an omnibox keyword.
model()->RegisterOmniboxKeyword("test", "extension", "keyword",
@@ -487,7 +488,7 @@ TEST_F(TemplateURLServiceTest, RestoreOmniboxExtensionKeyword) {
ASSERT_TRUE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
// Reload the data.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
// Ensure the omnibox keyword is restored correctly.
TemplateURL* t_url =
@@ -613,7 +614,7 @@ TEST_F(TemplateURLServiceTest, ClearBrowsingData_KeywordsForOrigin) {
TEST_F(TemplateURLServiceTest, Reset) {
// Add a new TemplateURL.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
const size_t initial_count = model()->GetTemplateURLs().size();
TemplateURLData data;
data.short_name = ASCIIToUTF16("google");
@@ -649,7 +650,7 @@ TEST_F(TemplateURLServiceTest, Reset) {
scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
// Reload the model from the database and make sure the change took.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
EXPECT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
const TemplateURL* read_url = model()->GetTemplateURLForKeyword(new_keyword);
ASSERT_TRUE(read_url);
@@ -659,12 +660,12 @@ TEST_F(TemplateURLServiceTest, Reset) {
TEST_F(TemplateURLServiceTest, DefaultSearchProvider) {
// Add a new TemplateURL.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
const size_t initial_count = model()->GetTemplateURLs().size();
TemplateURL* t_url = AddKeywordWithDate(
"name1", "key1", "http://foo1/{searchTerms}", "http://sugg1",
std::string(), "http://icon1", true, "UTF-8;UTF-16", Time(), Time());
- test_util_->ResetObserverCount();
+ test_util()->ResetObserverCount();
model()->SetUserSelectedDefaultSearchProvider(t_url);
ASSERT_EQ(t_url, model()->GetDefaultSearchProvider());
@@ -678,14 +679,14 @@ TEST_F(TemplateURLServiceTest, DefaultSearchProvider) {
scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
// Make sure when we reload we get a default search provider.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
EXPECT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
ASSERT_TRUE(model()->GetDefaultSearchProvider());
AssertEquals(*cloned_url, *model()->GetDefaultSearchProvider());
}
TEST_F(TemplateURLServiceTest, CantReplaceWithSameKeyword) {
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
ASSERT_TRUE(model()->CanReplaceKeyword(ASCIIToUTF16("foo"), GURL(), NULL));
TemplateURL* t_url = AddKeywordWithDate(
"name1", "foo", "http://foo1", "http://sugg1", std::string(),
@@ -705,7 +706,7 @@ TEST_F(TemplateURLServiceTest, CantReplaceWithSameKeyword) {
}
TEST_F(TemplateURLServiceTest, CantReplaceWithSameHosts) {
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
ASSERT_TRUE(model()->CanReplaceKeyword(ASCIIToUTF16("foo"),
GURL("http://foo.com"), NULL));
TemplateURL* t_url = AddKeywordWithDate(
@@ -730,13 +731,13 @@ TEST_F(TemplateURLServiceTest, HasDefaultSearchProvider) {
ASSERT_TRUE(model()->GetDefaultSearchProvider());
// Now force the model to load and make sure we still have a default.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
ASSERT_TRUE(model()->GetDefaultSearchProvider());
}
TEST_F(TemplateURLServiceTest, DefaultSearchProviderLoadedFromPrefs) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
TemplateURLData data;
data.short_name = ASCIIToUTF16("a");
@@ -756,7 +757,7 @@ TEST_F(TemplateURLServiceTest, DefaultSearchProviderLoadedFromPrefs) {
// Reset the model and don't load it. The template url we set as the default
// should be pulled from prefs now.
- test_util_->ResetModel(false);
+ test_util()->ResetModel(false);
// NOTE: This doesn't use AssertEquals as only a subset of the TemplateURLs
// value are persisted to prefs.
@@ -769,14 +770,14 @@ TEST_F(TemplateURLServiceTest, DefaultSearchProviderLoadedFromPrefs) {
EXPECT_EQ(id, default_turl->id());
// Now do a load and make sure the default search provider really takes.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
ASSERT_TRUE(model()->GetDefaultSearchProvider());
AssertEquals(*cloned_url, *model()->GetDefaultSearchProvider());
}
TEST_F(TemplateURLServiceTest, RepairPrepopulatedSearchEngines) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Edit Google search engine.
TemplateURL* google = model()->GetTemplateURLForKeyword(
@@ -835,12 +836,12 @@ TEST_F(TemplateURLServiceTest, RepairSearchEnginesWithManagedDefault) {
const char kEncodings[] = "UTF-16;UTF-32";
const char kAlternateURL[] = "http://test.com/search#t={searchTerms}";
const char kSearchTermsReplacementKey[] = "espv";
- test_util_->SetManagedDefaultSearchPreferences(true, kName, kKeyword,
- kSearchURL, std::string(),
- kIconURL, kEncodings,
- kAlternateURL,
- kSearchTermsReplacementKey);
- test_util_->VerifyLoad();
+ test_util()->SetManagedDefaultSearchPreferences(true, kName, kKeyword,
+ kSearchURL, std::string(),
+ kIconURL, kEncodings,
+ kAlternateURL,
+ kSearchTermsReplacementKey);
+ test_util()->VerifyLoad();
// Verify that the default manager we are getting is the managed one.
TemplateURLData data;
data.short_name = ASCIIToUTF16(kName);
@@ -883,7 +884,7 @@ TEST_F(TemplateURLServiceTest, UpdateKeywordSearchTermsForURL) {
{ "http://x/foo?query=b#q=xx", base::string16() },
};
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
AddKeywordWithDate("name", "x", "http://x/foo?q={searchTerms}",
"http://sugg1", "http://x/foo#query={searchTerms}",
"http://icon1", false, "UTF-8;UTF-16", Time(), Time());
@@ -893,7 +894,7 @@ TEST_F(TemplateURLServiceTest, UpdateKeywordSearchTermsForURL) {
GURL(data[i].url), false
};
model()->UpdateKeywordSearchTermsForURL(details);
- EXPECT_EQ(data[i].term, test_util_->GetAndClearSearchTerm());
+ EXPECT_EQ(data[i].term, test_util()->GetAndClearSearchTerm());
}
}
@@ -906,7 +907,7 @@ TEST_F(TemplateURLServiceTest, DontUpdateKeywordSearchForNonReplaceable) {
{ "http://x/foo?y=xx" },
};
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
AddKeywordWithDate("name", "x", "http://x/foo", "http://sugg1", std::string(),
"http://icon1", false, "UTF-8;UTF-16", Time(), Time());
@@ -915,16 +916,16 @@ TEST_F(TemplateURLServiceTest, DontUpdateKeywordSearchForNonReplaceable) {
GURL(data[i].url), false
};
model()->UpdateKeywordSearchTermsForURL(details);
- ASSERT_EQ(base::string16(), test_util_->GetAndClearSearchTerm());
+ ASSERT_EQ(base::string16(), test_util()->GetAndClearSearchTerm());
}
}
TEST_F(TemplateURLServiceWithoutFallbackTest, ChangeGoogleBaseValue) {
// NOTE: Do not load the prepopulate data, which also has a {google:baseURL}
// keyword in it and would confuse this test.
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
- test_util_->SetGoogleBaseURL(GURL("http://google.com/"));
+ test_util()->SetGoogleBaseURL(GURL("http://google.com/"));
const TemplateURL* t_url = AddKeywordWithDate(
"name", "google.com", "{google:baseURL}?q={searchTerms}", "http://sugg1",
std::string(), "http://icon1", false, "UTF-8;UTF-16", Time(), Time());
@@ -933,8 +934,8 @@ TEST_F(TemplateURLServiceWithoutFallbackTest, ChangeGoogleBaseValue) {
EXPECT_EQ(ASCIIToUTF16("google.com"), t_url->keyword());
// Change the Google base url.
- test_util_->ResetObserverCount();
- test_util_->SetGoogleBaseURL(GURL("http://google.co.uk/"));
+ test_util()->ResetObserverCount();
+ test_util()->SetGoogleBaseURL(GURL("http://google.co.uk/"));
VerifyObserverCount(1);
// Make sure the host->TemplateURL map was updated appropriately.
@@ -951,7 +952,7 @@ TEST_F(TemplateURLServiceWithoutFallbackTest, ChangeGoogleBaseValue) {
"manual", "google.de", "http://google.de/search?q={searchTerms}",
std::string(), std::string(), std::string(), false, "UTF-8", Time(),
Time());
- test_util_->SetGoogleBaseURL(GURL("http://google.de"));
+ test_util()->SetGoogleBaseURL(GURL("http://google.de"));
// Verify that the manual entry is untouched, and the autogenerated keyword
// has not changed.
@@ -966,7 +967,7 @@ TEST_F(TemplateURLServiceWithoutFallbackTest, ChangeGoogleBaseValue) {
// Change the base URL again and verify that the autogenerated keyword follows
// even though it didn't match the base URL, while the manual entry is still
// untouched.
- test_util_->SetGoogleBaseURL(GURL("http://google.fr/"));
+ test_util()->SetGoogleBaseURL(GURL("http://google.fr/"));
ASSERT_EQ(manual, model()->GetTemplateURLForHost("google.de"));
EXPECT_EQ("google.de", manual->url_ref().GetHost(search_terms_data()));
EXPECT_EQ(ASCIIToUTF16("google.de"), manual->keyword());
@@ -979,8 +980,8 @@ TEST_F(TemplateURLServiceWithoutFallbackTest, ChangeGoogleBaseValue) {
// Make sure TemplateURLService generates a KEYWORD_GENERATED visit for
// KEYWORD visits.
TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) {
- test_util_->VerifyLoad();
- ASSERT_TRUE(test_util_->profile()->CreateHistoryService(true, false));
+ test_util()->VerifyLoad();
+ ASSERT_TRUE(test_util()->profile()->CreateHistoryService(true, false));
// Create a keyword.
TemplateURL* t_url = AddKeywordWithDate(
@@ -990,7 +991,7 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) {
// Add a visit that matches the url of the keyword.
HistoryService* history =
- HistoryServiceFactory::GetForProfile(test_util_->profile(),
+ HistoryServiceFactory::GetForProfile(test_util()->profile(),
Profile::EXPLICIT_ACCESS);
history->AddPage(
GURL(t_url->url_ref().ReplaceSearchTerms(
@@ -1000,7 +1001,7 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) {
content::PAGE_TRANSITION_KEYWORD, history::SOURCE_BROWSED, false);
// Wait for history to finish processing the request.
- test_util_->profile()->BlockUntilHistoryProcessesPendingRequests();
+ test_util()->profile()->BlockUntilHistoryProcessesPendingRequests();
// Query history for the generated url.
base::CancelableTaskTracker tracker;
@@ -1012,7 +1013,7 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) {
&tracker);
// Wait for the request to be processed.
- test_util_->profile()->BlockUntilHistoryProcessesPendingRequests();
+ test_util()->profile()->BlockUntilHistoryProcessesPendingRequests();
// And make sure the url and visit were added.
EXPECT_TRUE(callback.success);
@@ -1028,14 +1029,14 @@ TEST_F(TemplateURLServiceTest, LoadDeletesUnusedProvider) {
// Create a preloaded template url. Add it to a loaded model and wait for the
// saves to finish.
TemplateURL* t_url = CreatePreloadedTemplateURL(true, 999999);
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
model()->Add(t_url);
ASSERT_TRUE(
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")) != NULL);
base::RunLoop().RunUntilIdle();
// Ensure that merging clears this engine.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_TRUE(
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")) == NULL);
@@ -1044,7 +1045,7 @@ TEST_F(TemplateURLServiceTest, LoadDeletesUnusedProvider) {
// Reload the model to verify that the database was updated as a result of the
// merge.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_TRUE(
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")) == NULL);
}
@@ -1054,7 +1055,7 @@ TEST_F(TemplateURLServiceTest, LoadDeletesUnusedProvider) {
TEST_F(TemplateURLServiceTest, LoadRetainsModifiedProvider) {
// Create a preloaded template url and add it to a loaded model.
TemplateURL* t_url = CreatePreloadedTemplateURL(false, 999999);
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
model()->Add(t_url);
// Do the copy after t_url is added so that the id is set.
@@ -1065,7 +1066,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsModifiedProvider) {
base::RunLoop().RunUntilIdle();
// Ensure that merging won't clear it if the user has edited it.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
const TemplateURL* url_for_unittest =
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest"));
ASSERT_TRUE(url_for_unittest != NULL);
@@ -1075,7 +1076,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsModifiedProvider) {
base::RunLoop().RunUntilIdle();
// Reload the model to verify that save/reload retains the item.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_TRUE(
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")) != NULL);
}
@@ -1084,7 +1085,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsModifiedProvider) {
// prepopulated engines that no longer exist in the prepopulate data if
// it has been modified by the user.
TEST_F(TemplateURLServiceTest, LoadSavesPrepopulatedDefaultSearchProvider) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Verify that the default search provider is set to something.
TemplateURL* default_search = model()->GetDefaultSearchProvider();
ASSERT_TRUE(default_search != NULL);
@@ -1095,7 +1096,7 @@ TEST_F(TemplateURLServiceTest, LoadSavesPrepopulatedDefaultSearchProvider) {
// Reload the model and check that the default search provider
// was properly saved.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
default_search = model()->GetDefaultSearchProvider();
ASSERT_TRUE(default_search != NULL);
AssertEquals(*cloned_url, *default_search);
@@ -1109,7 +1110,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsDefaultProvider) {
// is not in the current set of preloaded template urls and save
// the result.
TemplateURL* t_url = CreatePreloadedTemplateURL(true, 999999);
- test_util_->ChangeModelToLoadState();
+ test_util()->ChangeModelToLoadState();
model()->Add(t_url);
model()->SetUserSelectedDefaultSearchProvider(t_url);
// Do the copy after t_url is added and set as default so that its
@@ -1122,7 +1123,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsDefaultProvider) {
// Ensure that merging won't clear the prepopulated template url
// which is no longer present if it's the default engine.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
{
const TemplateURL* keyword_url =
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest"));
@@ -1135,7 +1136,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsDefaultProvider) {
base::RunLoop().RunUntilIdle();
// Reload the model to verify that the update was saved.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
{
const TemplateURL* keyword_url =
model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest"));
@@ -1149,7 +1150,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsDefaultProvider) {
// missing and not managed.
TEST_F(TemplateURLServiceTest, LoadEnsuresDefaultSearchProviderExists) {
// Force the model to load and make sure we have a default search provider.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
EXPECT_TRUE(model()->GetDefaultSearchProvider());
EXPECT_TRUE(model()->GetDefaultSearchProvider()->SupportsReplacement(
@@ -1163,7 +1164,7 @@ TEST_F(TemplateURLServiceTest, LoadEnsuresDefaultSearchProviderExists) {
// Reset the model and load it. There should be a usable default search
// provider.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_TRUE(model()->GetDefaultSearchProvider());
EXPECT_TRUE(model()->GetDefaultSearchProvider()->SupportsReplacement(
@@ -1173,13 +1174,12 @@ TEST_F(TemplateURLServiceTest, LoadEnsuresDefaultSearchProviderExists) {
// Simulates failing to load the webdb and makes sure the default search
// provider is valid.
TEST_F(TemplateURLServiceTest, FailedInit) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
- test_util_->ClearModel();
- WebDataServiceFactory::GetKeywordWebDataForProfile(
- test_util_->profile(), Profile::EXPLICIT_ACCESS)->ShutdownDatabase();
+ test_util()->ClearModel();
+ test_util()->web_data_service()->ShutdownDatabase();
- test_util_->ResetModel(false);
+ test_util()->ResetModel(false);
model()->Load();
base::RunLoop().RunUntilIdle();
@@ -1190,9 +1190,9 @@ TEST_F(TemplateURLServiceTest, FailedInit) {
// the default search as managed. Also check that we are getting the right
// values.
TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
const size_t initial_count = model()->GetTemplateURLs().size();
- test_util_->ResetObserverCount();
+ test_util()->ResetObserverCount();
// Set a regular default search provider.
TemplateURL* regular_default = AddKeywordWithDate(
@@ -1214,7 +1214,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
const char kEncodings[] = "UTF-16;UTF-32";
const char kAlternateURL[] = "http://test.com/search#t={searchTerms}";
const char kSearchTermsReplacementKey[] = "espv";
- test_util_->SetManagedDefaultSearchPreferences(true, kName, kKeyword,
+ test_util()->SetManagedDefaultSearchPreferences(true, kName, kKeyword,
kSearchURL, std::string(), kIconURL, kEncodings, kAlternateURL,
kSearchTermsReplacementKey);
VerifyObserverFired();
@@ -1242,7 +1242,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
const char kNewKeyword[] = "other.com";
const char kNewSearchURL[] = "http://other.com/search?t={searchTerms}";
const char kNewSuggestURL[] = "http://other.com/suggest?t={searchTerms}";
- test_util_->SetManagedDefaultSearchPreferences(true, kNewName, kNewKeyword,
+ test_util()->SetManagedDefaultSearchPreferences(true, kNewName, kNewKeyword,
kNewSearchURL, kNewSuggestURL, std::string(), std::string(),
std::string(), std::string());
VerifyObserverFired();
@@ -1262,7 +1262,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
EXPECT_EQ(actual_managed_default->show_in_default_list(), true);
// Remove all the managed prefs and check that we are no longer managed.
- test_util_->RemoveManagedDefaultSearchPreferences();
+ test_util()->RemoveManagedDefaultSearchPreferences();
VerifyObserverFired();
EXPECT_FALSE(model()->is_default_search_managed());
EXPECT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
@@ -1274,7 +1274,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
EXPECT_EQ(actual_final_managed_default->show_in_default_list(), true);
// Disable the default search provider through policy.
- test_util_->SetManagedDefaultSearchPreferences(false, std::string(),
+ test_util()->SetManagedDefaultSearchPreferences(false, std::string(),
std::string(), std::string(), std::string(), std::string(),
std::string(), std::string(), std::string());
VerifyObserverFired();
@@ -1283,7 +1283,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
EXPECT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
// Re-enable it.
- test_util_->SetManagedDefaultSearchPreferences(true, kName, kKeyword,
+ test_util()->SetManagedDefaultSearchPreferences(true, kName, kKeyword,
kSearchURL, std::string(), kIconURL, kEncodings, kAlternateURL,
kSearchTermsReplacementKey);
VerifyObserverFired();
@@ -1300,8 +1300,8 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
// This checks against regressions of http://crbug.com/67180
// First, remove the preferences, reset the model, and set a default.
- test_util_->RemoveManagedDefaultSearchPreferences();
- test_util_->ResetModel(true);
+ test_util()->RemoveManagedDefaultSearchPreferences();
+ test_util()->ResetModel(true);
TemplateURL* new_default =
model()->GetTemplateURLForKeyword(ASCIIToUTF16("key1"));
ASSERT_FALSE(new_default == NULL);
@@ -1309,11 +1309,11 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
EXPECT_EQ(new_default, model()->GetDefaultSearchProvider());
// Now reset the model again but load it after setting the preferences.
- test_util_->ResetModel(false);
- test_util_->SetManagedDefaultSearchPreferences(false, std::string(),
+ test_util()->ResetModel(false);
+ test_util()->SetManagedDefaultSearchPreferences(false, std::string(),
std::string(), std::string(), std::string(), std::string(),
std::string(), std::string(), std::string());
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
EXPECT_TRUE(model()->is_default_search_managed());
EXPECT_TRUE(model()->GetDefaultSearchProvider() == NULL);
}
@@ -1322,7 +1322,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
// assigns it a newly generated GUID.
TEST_F(TemplateURLServiceTest, PatchEmptySyncGUID) {
// Add a new TemplateURL.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
const size_t initial_count = model()->GetTemplateURLs().size();
TemplateURLData data;
@@ -1339,7 +1339,7 @@ TEST_F(TemplateURLServiceTest, PatchEmptySyncGUID) {
// Reload the model to verify it was actually saved to the database and
// assigned a new GUID when brought back.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
const TemplateURL* loaded_url =
model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
@@ -1351,7 +1351,7 @@ TEST_F(TemplateURLServiceTest, PatchEmptySyncGUID) {
// process de-dupes them.
TEST_F(TemplateURLServiceTest, DuplicateInputEncodings) {
// Add a new TemplateURL.
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
const size_t initial_count = model()->GetTemplateURLs().size();
TemplateURLData data;
@@ -1380,7 +1380,7 @@ TEST_F(TemplateURLServiceTest, DuplicateInputEncodings) {
// Reload the model to verify it was actually saved to the database and the
// duplicate encodings were removed.
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
loaded_url = model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
ASSERT_FALSE(loaded_url == NULL);
@@ -1388,7 +1388,7 @@ TEST_F(TemplateURLServiceTest, DuplicateInputEncodings) {
}
TEST_F(TemplateURLServiceTest, DefaultExtensionEngine) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Add third-party default search engine.
TemplateURL* user_dse = AddKeywordWithDate(
"user", "user", "http://www.goo.com/s?q={searchTerms}",
@@ -1414,7 +1414,7 @@ TEST_F(TemplateURLServiceTest, DefaultExtensionEngine) {
}
TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) {
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Add third-party default search engine.
TemplateURL* user_dse = AddKeywordWithDate(
"user", "user", "http://www.goo.com/s?q={searchTerms}",
@@ -1444,7 +1444,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) {
model()->AddExtensionControlledTURL(ext_dse, extension_info.Pass());
EXPECT_EQ(ext_dse, model()->GetDefaultSearchProvider());
- test_util_->ResetModel(true);
+ test_util()->ResetModel(true);
user_dse = model()->GetTemplateURLForKeyword(ASCIIToUTF16("user"));
ExpectSimilar(user_dse, model()->GetDefaultSearchProvider());
EXPECT_FALSE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1")));
@@ -1460,10 +1460,10 @@ TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) {
const char kEncodings[] = "UTF-16;UTF-32";
const char kAlternateURL[] = "http://test.com/search#t={searchTerms}";
const char kSearchTermsReplacementKey[] = "espv";
- test_util_->SetManagedDefaultSearchPreferences(
+ test_util()->SetManagedDefaultSearchPreferences(
true, kName, kKeyword, kSearchURL, std::string(), kIconURL, kEncodings,
kAlternateURL, kSearchTermsReplacementKey);
- test_util_->VerifyLoad();
+ test_util()->VerifyLoad();
// Verify that the default manager we are getting is the managed one.
TemplateURLData data;
data.short_name = ASCIIToUTF16(kName);
« no previous file with comments | « components/search_engines/template_url_service_sync_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698