Componentize URLDatabase

components/history/core/browser/keyword_search_term.h

Index: components/history/core/browser/keyword_search_term.h
diff --git a/components/translate/core/common/language_detection_details.h b/components/history/core/browser/keyword_search_term.h
similarity index 19%
copy from components/translate/core/common/language_detection_details.h
copy to components/history/core/browser/keyword_search_term.h
index 6cc1a66c274075ede778550c99bc83ae40bed6cc..1648401a03ba42a7e5ac02a35a5e9482355c476c 100644
--- a/components/translate/core/common/language_detection_details.h
+++ b/components/history/core/browser/keyword_search_term.h
@@ -2,42 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_TRANSLATE_CORE_COMMON_LANGUAGE_DETECTION_DETAILS_H_
-#define COMPONENTS_TRANSLATE_CORE_COMMON_LANGUAGE_DETECTION_DETAILS_H_
-
-#include <string>
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_KEYWORD_SEARCH_TERM_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_KEYWORD_SEARCH_TERM_H_
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#include "url/gurl.h"
-
-struct LanguageDetectionDetails {
-  LanguageDetectionDetails();
-  ~LanguageDetectionDetails();
-
-  // The time when this was created.
-  base::Time time;
-
-  // The URL.
-  GURL url;
+#include "components/history/core/browser/keyword_id.h"
+#include "components/history/core/browser/url_row.h"
 
-  // The language detected by the content (Content-Language).
-  std::string content_language;
+namespace history {
 
-  // The language detected by CLD.
-  std::string cld_language;
+// KeywordSearchTermVisit is returned from GetMostRecentKeywordSearchTerms. It
+// gives the time and search term of the keyword visit.
+struct KeywordSearchTermVisit {
+  KeywordSearchTermVisit();
+  ~KeywordSearchTermVisit();
 
-  // Whether the CLD detection is reliable or not.
-  bool is_cld_reliable;
-
-  // The language written in the lang attribute of the html element.
-  std::string html_root_language;
+  base::string16 term;    // The search term that was used.

[sdefresne, 2014/06/25 13:21:09]

nit: either align all the comments, or use two-spaces everywhere.

[hashimoto, 2014/06/25 16:37:33]

Now using two-spaces everywhere.

+  int visits;       // The visit count.
+  base::Time time;  // The time of the most recent visit.
+};
 
-  // The adopted language.
-  std::string adopted_language;
+// Used for URLs that have a search term associated with them.
+struct KeywordSearchTermRow {
+  KeywordSearchTermRow();
+  ~KeywordSearchTermRow();
 
-  // The contents which is used for detection.
-  base::string16 contents;
+  KeywordID keyword_id;  // ID of the keyword.
+  URLID url_id;  // ID of the url.
+  base::string16 term;  // The search term that was used.
 };
 
-#endif  // COMPONENTS_TRANSLATE_CORE_COMMON_LANGUAGE_DETECTION_DETAILS_H_
+}  // namespace history
+
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_KEYWORD_SEARCH_TERM_H_