Stop using UIThreadSearchTermsData for search_engines related tests

chrome/browser/search_engines/template_url_service_sync_unittest.cc

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index aad5815a2f1cde6c999ad535e3c391f20aff0cd0..59f153e4ef718890fd405c745c377c51fda00a7f 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -10,10 +10,10 @@
 #include "base/time/time.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
-#include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/search_engines/search_engines_pref_names.h"
+#include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
@@ -237,9 +237,9 @@ void TemplateURLServiceSyncTest::SetUp() {
   TemplateURLServiceFactory::GetInstance()->
       RegisterUserPrefsOnBrowserContextForTest(profile_b_.get());
   model_b_.reset(new TemplateURLService(
-      profile_b_->GetPrefs(), scoped_ptr<SearchTermsData>(
-          new UIThreadSearchTermsData(profile_b_.get())), NULL,
-      scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure()));
+      profile_b_->GetPrefs(), scoped_ptr<SearchTermsData>(new SearchTermsData),

[Peter Kasting, 2014/08/22 18:57:26]

Nit: make_scoped_ptr() would be slightly shorter

[hashimoto, 2014/08/25 05:45:21]

Done.

+      NULL, scoped_ptr<TemplateURLServiceClient>(), NULL, NULL,
+      base::Closure()));
   model_b_->Load();
 }
 
@@ -1122,7 +1122,7 @@ TEST_F(TemplateURLServiceSyncTest, AutogeneratedKeywordMigrated) {
   TemplateURL* key1 = model()->GetTemplateURLForHost("key1.com");
   ASSERT_FALSE(key1 == NULL);
   EXPECT_EQ(ASCIIToUTF16("key1.com"), key1->keyword());
-  GURL google_url(UIThreadSearchTermsData(profile_a()).GoogleBaseURLValue());
+  GURL google_url(model()->search_terms_data().GoogleBaseURLValue());
   TemplateURL* key2 = model()->GetTemplateURLForHost(google_url.host());
   ASSERT_FALSE(key2 == NULL);
   base::string16 google_keyword(net::StripWWWFromHost(google_url));
@@ -1144,7 +1144,7 @@ TEST_F(TemplateURLServiceSyncTest, AutogeneratedKeywordConflicts) {
   // Sync brings in some autogenerated keywords, but the generated keywords we
   // try to create conflict with ones in the model.
   base::string16 google_keyword(net::StripWWWFromHost(GURL(
-      UIThreadSearchTermsData(profile_a()).GoogleBaseURLValue())));
+      model()->search_terms_data().GoogleBaseURLValue())));
   const std::string local_google_url =
       "{google:baseURL}1/search?q={searchTerms}";
   TemplateURL* google = CreateTestTemplateURL(google_keyword, local_google_url);
@@ -1217,7 +1217,7 @@ TEST_F(TemplateURLServiceSyncTest, TwoAutogeneratedKeywordsUsingGoogleBaseURL) {
 
   // We should still have coalesced the updates to one each.
   base::string16 google_keyword(net::StripWWWFromHost(GURL(
-      UIThreadSearchTermsData(profile_a()).GoogleBaseURLValue())));
+      model()->search_terms_data().GoogleBaseURLValue())));
   TemplateURL* keyword1 =
       model()->GetTemplateURLForKeyword(google_keyword + ASCIIToUTF16("_"));
   ASSERT_FALSE(keyword1 == NULL);