Componentize TemplateURLService

components/search_engines/keyword_web_data_service.cc

 // Copyright 2014 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.
 
-#include "chrome/browser/webdata/keyword_web_data_service.h"
+#include "components/search_engines/keyword_web_data_service.h"
 
 #include "base/bind.h"
-#include "chrome/browser/webdata/keyword_table.h"
+#include "components/search_engines/keyword_table.h"
 #include "components/search_engines/template_url_data.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_database_service.h"
 
 using base::Bind;
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
@@ skipping 121 matching lines @@
   return KeywordTable::FromWebDatabase(db)->SetDefaultSearchProviderID(id) ?
       WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State KeywordWebDataService::SetBuiltinKeywordVersionImpl(
     int version,
     WebDatabase* db) {
   return KeywordTable::FromWebDatabase(db)->SetBuiltinKeywordVersion(version) ?
       WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }