Move TemplateURLService related tests to components/search_engines

chrome/browser/search_engines/template_url_service_test_util.h

Index: chrome/browser/search_engines/template_url_service_test_util.h
diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h
index 4833a9acdaa3330fbc130e2e9f715758e7adc765..e6aa853581c8094cf6ee0c2acc8bca5ff264d96b 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.h
+++ b/chrome/browser/search_engines/template_url_service_test_util.h
@@ -9,16 +9,16 @@
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "components/search_engines/template_url_service_observer.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 
 class GURL;
+class KeywordWebDataService;
 class TemplateURLService;
 class TestingProfile;
 class TestingSearchTermsData;
-class TestingTemplateURLService;
 
 class TemplateURLServiceTestUtil : public TemplateURLServiceObserver {
  public:
@@ -73,19 +73,23 @@ class TemplateURLServiceTestUtil : public TemplateURLServiceObserver {
   // trigger notification.

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

Nit: trigger -> triggers

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

Done.

   void RemoveManagedDefaultSearchPreferences();
 
+  // Returns the KeywordWebDataService.

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

Nit: Remove this comment ant the two below, they add nothing to the code

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

Done.

+  KeywordWebDataService* web_data_service() { return web_data_service_.get(); }
+
   // Returns the TemplateURLService.
-  TemplateURLService* model();
+  TemplateURLService* model() { return model_.get(); }
 
   // Returns the TestingProfile.
   TestingProfile* profile() { return profile_.get(); }
 
  private:
-  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   base::ScopedTempDir temp_dir_;
   int changed_count_;
+  base::string16 search_term_;
+  scoped_refptr<KeywordWebDataService> web_data_service_;
   TestingSearchTermsData* search_terms_data_;
-  scoped_ptr<TestingTemplateURLService> model_;
+  scoped_ptr<TemplateURLService> model_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTestUtil);
 };