Move search_terms_data to components/search_engines

components/search_engines/search_terms_data.h

Index: components/search_engines/search_terms_data.h
diff --git a/chrome/browser/search_engines/search_terms_data.h b/components/search_engines/search_terms_data.h
similarity index 65%
rename from chrome/browser/search_engines/search_terms_data.h
rename to components/search_engines/search_terms_data.h
index 7167374166c0c9ed74a236a05e5e80dfe6827c62..a97a9c98b258a5406e6ac1d3fa41af5654c0ccc5 100644
--- a/chrome/browser/search_engines/search_terms_data.h
+++ b/components/search_engines/search_terms_data.h
@@ -2,8 +2,8 @@
 // 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_SEARCH_TERMS_DATA_H_
-#define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_
+#ifndef COMPONENTS_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_
+#define COMPONENTS_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_
 
 #include <string>
 
@@ -11,8 +11,6 @@
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 
-class Profile;
-
 // All data needed by TemplateURLRef::ReplaceSearchTerms which typically may
 // only be accessed on the UI thread.
 class SearchTermsData {
@@ -62,31 +60,4 @@ class SearchTermsData {
   DISALLOW_COPY_AND_ASSIGN(SearchTermsData);
 };
 
-// Implementation of SearchTermsData that is only usable on the UI thread.
-class UIThreadSearchTermsData : public SearchTermsData {
- public:
-  // If |profile_| is NULL, the Google base URL accessors will return default
-  // values, and NTPIsThemedParam() will return an empty string.
-  explicit UIThreadSearchTermsData(Profile* profile);
-
-  virtual std::string GoogleBaseURLValue() const OVERRIDE;
-  virtual std::string GetApplicationLocale() const OVERRIDE;
-  virtual base::string16 GetRlzParameterValue(bool from_app_list) const
-      OVERRIDE;
-  virtual std::string GetSearchClient() const OVERRIDE;
-  virtual std::string GetSuggestClient() const OVERRIDE;
-  virtual std::string GetSuggestRequestIdentifier() const OVERRIDE;
-  virtual std::string NTPIsThemedParam() const OVERRIDE;
-
-  // Used by tests to override the value for the Google base URL.  Passing the
-  // empty string cancels this override.
-  static void SetGoogleBaseURL(const std::string& base_url);
-
- private:
-  static std::string* google_base_url_;
-  Profile* profile_;
-
-  DISALLOW_COPY_AND_ASSIGN(UIThreadSearchTermsData);
-};
-
-#endif  // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_
+#endif  // COMPONENTS_SEARCH_ENGINES_SEARCH_TERMS_DATA_H_