Move TemplateURLService related tests to components/search_engines

components/search_engines/template_url_service_unittest.cc

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 99%
rename from chrome/browser/search_engines/template_url_service_unittest.cc
rename to components/search_engines/template_url_service_unittest.cc
index ffd3cb422d3c88ae1535bbe85ff475583d016ff0..6d729f05c1707ccc62e44faa30a7d131745407cf 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;
@@ -166,6 +165,7 @@ class TemplateURLServiceTest : public testing::Test {
   }
 
  protected:
+  content::TestBrowserThreadBundle thread_bundle_;

[Peter Kasting, 2014/08/28 19:06:20]

Nit: Add comments about why we need this.

While here, try to make these data members private instead of protected where
possible.

[hashimoto, 2014/08/29 08:06:26]

Added comments and made all data members private.

   scoped_ptr<TemplateURLServiceTestUtil> test_util_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTest);
@@ -1176,8 +1176,7 @@ TEST_F(TemplateURLServiceTest, FailedInit) {
   test_util_->VerifyLoad();
 
   test_util_->ClearModel();
-  WebDataServiceFactory::GetKeywordWebDataForProfile(
-      test_util_->profile(), Profile::EXPLICIT_ACCESS)->ShutdownDatabase();
+  test_util_->web_data_service()->ShutdownDatabase();
 
   test_util_->ResetModel(false);
   model()->Load();