Move TemplateURLService related tests to components/search_engines

chrome/browser/search_engines/template_url_service_test_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
 
 #include <string>
 
 #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:
   TemplateURLServiceTestUtil();
   virtual ~TemplateURLServiceTestUtil();
 
   // TemplateURLServiceObserver implemementation.
   virtual void OnTemplateURLServiceChanged() OVERRIDE;
 
   // Gets the observer count.
@@ skipping 13 matching lines @@
   // Deletes the current model (and doesn't create a new one).
   void ClearModel();
 
   // Creates a new TemplateURLService.
   void ResetModel(bool verify_load);
 
   // Returns the search term from the last invocation of
   // TemplateURLService::SetKeywordSearchTermsForURL and clears the search term.
   base::string16 GetAndClearSearchTerm();
 
   // Set the google base url.  |base_url| must be valid.

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

Nit: Set -> Sets

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

Done.

   void SetGoogleBaseURL(const GURL& base_url);
 
   // Set the managed preferences for the default search provider and trigger

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

Nit: Set -> Sets

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

Done.

   // notification. If |alternate_url| is empty, uses an empty list of alternate
   // URLs, otherwise use a list containing a single entry.

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

Nit: use -> uses

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

Done.

   void SetManagedDefaultSearchPreferences(
       bool enabled,
       const std::string& name,
       const std::string& keyword,
       const std::string& search_url,
       const std::string& suggest_url,
       const std::string& icon_url,
       const std::string& encodings,
       const std::string& alternate_url,
       const std::string& search_terms_replacement_key);
 
   // Remove all the managed preferences for the default search provider and

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

Nit: Remove -> Removes

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

Done.

   // 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);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_