Split token-related methods from WebDataService

chrome/browser/webdata/web_data_service.cc

Index: chrome/browser/webdata/web_data_service.cc
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 9d095f89e88a60fd6e4e7b9166cd041dd25600bf..4c8a2c27c4e9b44de7ae3b4c8c1e8f993afe2f75 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -113,30 +113,6 @@ WebDataServiceBase::Handle WebDataService::GetWebAppImages(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//
-// Token Service
-//
-////////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::SetTokenForService(const std::string& service,
-                                        const std::string& token) {
-  wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&WebDataService::SetTokenForServiceImpl, this, service, token));
-}
-
-void WebDataService::RemoveAllTokens() {
-  wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&WebDataService::RemoveAllTokensImpl, this));
-}
-
-// Null on failure. Success is WDResult<std::string>
-WebDataServiceBase::Handle WebDataService::GetAllTokens(
-    WebDataServiceConsumer* consumer) {
-  return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&WebDataService::GetAllTokensImpl, this), consumer);
-}
-
-////////////////////////////////////////////////////////////////////////////////
 
 WebDataService::WebDataService()
     : WebDataServiceBase(NULL, ProfileErrorCallback()) {
@@ -236,32 +212,3 @@ scoped_ptr<WDTypedResult> WebDataService::GetWebAppImagesImpl(
   return scoped_ptr<WDTypedResult>(
       new WDResult<WDAppImagesResult>(WEB_APP_IMAGES, result));
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Token Service implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-WebDatabase::State WebDataService::RemoveAllTokensImpl(WebDatabase* db) {
-  if (TokenServiceTable::FromWebDatabase(db)->RemoveAllTokens()) {
-    return WebDatabase::COMMIT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-WebDatabase::State WebDataService::SetTokenForServiceImpl(
-    const std::string& service, const std::string& token, WebDatabase* db) {
-  if (TokenServiceTable::FromWebDatabase(db)->SetTokenForService(service,
-                                                                 token)) {
-    return WebDatabase::COMMIT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-scoped_ptr<WDTypedResult> WebDataService::GetAllTokensImpl(WebDatabase* db) {
-  std::map<std::string, std::string> map;
-  TokenServiceTable::FromWebDatabase(db)->GetAllTokens(&map);
-  return scoped_ptr<WDTypedResult>(
-      new WDResult<std::map<std::string, std::string> >(TOKEN_RESULT, map));
-}