Split token-related methods from WebDataService

chrome/browser/webdata/web_data_service_factory.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_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
+#include "chrome/browser/webdata/token_web_data.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/webdata/common/webdata_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
@@ skipping 60 matching lines @@
   // WebIntentsTable, then remove this.
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new WebIntentsTable()));
 
   web_database_->LoadDatabase();
 
   autofill_web_data_ = new AutofillWebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   autofill_web_data_->Init();
 
+  token_web_data_ = new TokenWebData(
+      web_database_, base::Bind(&ProfileErrorCallback));
+  token_web_data_->Init();
+
   web_data_ = new WebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   web_data_->Init();
 
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&InitSyncableServicesOnDBThread,
                  autofill_web_data_,
                  profile_path,
                  g_browser_process->GetApplicationLocale()));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
 }
 
 void WebDataServiceWrapper::Shutdown() {
   autofill_web_data_->ShutdownOnUIThread();
+  token_web_data_->ShutdownOnUIThread();
   web_data_->ShutdownOnUIThread();
   web_database_->ShutdownDatabase();
 }
 
 scoped_refptr<AutofillWebDataService>
 WebDataServiceWrapper::GetAutofillWebData() {
   return autofill_web_data_.get();
 }
 
 scoped_refptr<WebDataService> WebDataServiceWrapper::GetWebData() {
   return web_data_.get();
 }
 
+scoped_refptr<TokenWebData> WebDataServiceWrapper::GetTokenWebData() {
+  return token_web_data_.get();
+}
+
 // static
 scoped_refptr<AutofillWebDataService>
 AutofillWebDataService::FromBrowserContext(content::BrowserContext* context) {
   // For this service, the implicit/explicit distinction doesn't
   // really matter; it's just used for a DCHECK.  So we currently
   // cheat and always say EXPLICIT_ACCESS.
   WebDataServiceWrapper* wrapper =
       WebDataServiceFactory::GetForProfile(
           static_cast<Profile*>(context), Profile::EXPLICIT_ACCESS);
   if (wrapper)
     return wrapper->GetAutofillWebData();
   // |wrapper| can be NULL in Incognito mode.
   return scoped_refptr<AutofillWebDataService>(NULL);
 }
 
 // static
+scoped_refptr<TokenWebData> TokenWebData::FromBrowserContext(
+    content::BrowserContext* context) {
+  // For this service, the implicit/explicit distinction doesn't
+  // really matter; it's just used for a DCHECK.  So we currently
+  // cheat and always say EXPLICIT_ACCESS.
+  WebDataServiceWrapper* wrapper =
+      WebDataServiceFactory::GetForProfile(
+          static_cast<Profile*>(context), Profile::EXPLICIT_ACCESS);
+  if (wrapper)
+    return wrapper->GetTokenWebData();
+  // |wrapper| can be NULL in Incognito mode.
+  return scoped_refptr<TokenWebData>(NULL);
+}
+
+// static
 scoped_refptr<WebDataService> WebDataService::FromBrowserContext(
     content::BrowserContext* context) {
   // For this service, the implicit/explicit distinction doesn't
   // really matter; it's just used for a DCHECK.  So we currently
   // cheat and always say EXPLICIT_ACCESS.
   WebDataServiceWrapper* wrapper =
       WebDataServiceFactory::GetForProfile(
           static_cast<Profile*>(context), Profile::EXPLICIT_ACCESS);
   if (wrapper)
     return wrapper->GetWebData();
@@ skipping 42 matching lines @@
 }
 
 ProfileKeyedService* WebDataServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }