Split token-related methods from WebDataService

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2012 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/web_data_service.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
@@ skipping 95 matching lines @@
       Bind(&WebDataService::RemoveWebAppImpl, this, app_url));
 }
 
 WebDataServiceBase::Handle WebDataService::GetWebAppImages(
     const GURL& app_url, WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetWebAppImagesImpl, this, app_url), consumer);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//
-// 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()) {
 }
 
 WebDataService::~WebDataService() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 79 matching lines @@
 
 scoped_ptr<WDTypedResult> WebDataService::GetWebAppImagesImpl(
     const GURL& app_url, WebDatabase* db) {
   WDAppImagesResult result;
   result.has_all_images =
       WebAppsTable::FromWebDatabase(db)->GetWebAppHasAllImages(app_url);
   WebAppsTable::FromWebDatabase(db)->GetWebAppImages(app_url, &result.images);
   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));
-}