Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / history / android / android_provider_backend.cc

diff --git a/src/chrome/browser/history/android/android_provider_backend.cc b/src/chrome/browser/history/android/android_provider_backend.cc
index fb1cb38..881d633 100644 (file)
--- a/src/chrome/browser/history/android/android_provider_backend.cc
+++ b/src/chrome/browser/history/android/android_provider_backend.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "components/history/core/browser/history_client.h"
+#include "components/history/core/browser/keyword_search_term.h"
 #include "content/public/common/page_transition_types.h"
 #include "sql/connection.h"
 
@@ -1177,7 +1178,7 @@ void AndroidProviderBackend::BroadcastNotifications(
 
 bool AndroidProviderBackend::AddSearchTerm(const SearchRow& values) {
   DCHECK(values.is_value_set_explicitly(SearchRow::SEARCH_TERM));
-  DCHECK(values.is_value_set_explicitly(SearchRow::TEMPLATE_URL));
+  DCHECK(values.is_value_set_explicitly(SearchRow::KEYWORD_ID));
   DCHECK(values.is_value_set_explicitly(SearchRow::URL));
 
   URLRow url_row;
@@ -1202,7 +1203,7 @@ bool AndroidProviderBackend::AddSearchTerm(const SearchRow& values) {
 
     if (!history_db_->GetKeywordSearchTermRow(url_row.id(), NULL))
       if (!history_db_->SetKeywordSearchTermsForURL(url_row.id(),
-               values.template_url_id(), values.search_term()))
+               values.keyword_id(), values.search_term()))
         return false;
   } else {
     bookmark_row.set_raw_url(values.url().spec());
@@ -1220,7 +1221,7 @@ bool AndroidProviderBackend::AddSearchTerm(const SearchRow& values) {
       return false;
 
     if (!history_db_->SetKeywordSearchTermsForURL(bookmark_row.url_id(),
-                          values.template_url_id(), values.search_term()))
+                          values.keyword_id(), values.search_term()))
       return false;
   }
   return true;