diff options
Diffstat (limited to 'chrome/browser/sync/test/integration')
| -rw-r--r-- | chrome/browser/sync/test/integration/search_engines_helper.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/sync/test/integration/search_engines_helper.cc b/chrome/browser/sync/test/integration/search_engines_helper.cc index 1a9f4e0..f84c3b1 100644 --- a/chrome/browser/sync/test/integration/search_engines_helper.cc +++ b/chrome/browser/sync/test/integration/search_engines_helper.cc @@ -221,13 +221,13 @@ void EditSearchEngine(int profile_index, const std::string& url) { DCHECK(!url.empty()); TemplateURLService* service = GetServiceForProfile(profile_index); - const TemplateURL* turl = service->GetTemplateURLForKeyword(keyword); + TemplateURL* turl = service->GetTemplateURLForKeyword(keyword); EXPECT_TRUE(turl); ASSERT_FALSE(new_keyword.empty()); service->ResetTemplateURL(turl, short_name, new_keyword, url); // Make sure we do the same on the verifier. if (test()->use_verifier()) { - const TemplateURL* verifier_turl = + TemplateURL* verifier_turl = GetVerifierService()->GetTemplateURLForKeyword(keyword); EXPECT_TRUE(verifier_turl); GetVerifierService()->ResetTemplateURL(verifier_turl, short_name, @@ -238,12 +238,12 @@ void EditSearchEngine(int profile_index, void DeleteSearchEngineBySeed(int profile_index, int seed) { TemplateURLService* service = GetServiceForProfile(profile_index); string16 keyword(CreateKeyword(seed)); - const TemplateURL* turl = service->GetTemplateURLForKeyword(keyword); + TemplateURL* turl = service->GetTemplateURLForKeyword(keyword); EXPECT_TRUE(turl); service->Remove(turl); // Make sure we do the same on the verifier. if (test()->use_verifier()) { - const TemplateURL* verifier_turl = + TemplateURL* verifier_turl = GetVerifierService()->GetTemplateURLForKeyword(keyword); EXPECT_TRUE(verifier_turl); GetVerifierService()->Remove(verifier_turl); @@ -253,12 +253,11 @@ void DeleteSearchEngineBySeed(int profile_index, int seed) { void ChangeDefaultSearchProvider(int profile_index, int seed) { TemplateURLService* service = GetServiceForProfile(profile_index); ASSERT_TRUE(service); - const TemplateURL* turl = - service->GetTemplateURLForKeyword(CreateKeyword(seed)); + TemplateURL* turl = service->GetTemplateURLForKeyword(CreateKeyword(seed)); ASSERT_TRUE(turl); service->SetDefaultSearchProvider(turl); if (test()->use_verifier()) { - const TemplateURL* verifier_turl = + TemplateURL* verifier_turl = GetVerifierService()->GetTemplateURLForKeyword(CreateKeyword(seed)); ASSERT_TRUE(verifier_turl); GetVerifierService()->SetDefaultSearchProvider(verifier_turl); diff --git a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc index 83ec779..9251fcc 100644 --- a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc @@ -146,8 +146,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, ConflictKeyword) { search_engines_helper::AddSearchEngine(0, 0); search_engines_helper::AddSearchEngine(1, 1); TemplateURLService* service = search_engines_helper::GetServiceForProfile(1); - const TemplateURL* turl = - service->GetTemplateURLForKeyword(ASCIIToUTF16("test1")); + TemplateURL* turl = service->GetTemplateURLForKeyword(ASCIIToUTF16("test1")); EXPECT_TRUE(turl); service->ResetTemplateURL(turl, turl->short_name(), ASCIIToUTF16("test0"), turl->url()); |