Un-refcount AutofillWebData and TokenWebData

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"
@@ skipping 23 matching lines @@
 namespace {
 
 // Callback to show error dialog on profile load error.
 void ProfileErrorCallback(sql::InitStatus status) {
   ShowProfileErrorDialog(
       (status == sql::INIT_FAILURE) ?
       IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
 }
 
 void InitSyncableServicesOnDBThread(
-    scoped_refptr<AutofillWebDataService> autofill_web_data,
+    AutofillWebDataService* autofill_web_data,
     const base::FilePath& profile_path,
     const std::string& app_locale,
     autofill::AutofillWebDataBackend* autofill_backend) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   // Currently only Autocomplete and Autofill profiles use the new Sync API, but
   // all the database data should migrate to this API over time.
   AutocompleteSyncableService::CreateForWebDataServiceAndBackend(
-      autofill_web_data.get(), autofill_backend);
-  AutocompleteSyncableService::FromWebDataService(autofill_web_data.get())
+      autofill_web_data, autofill_backend);
+  AutocompleteSyncableService::FromWebDataService(autofill_web_data)
       ->InjectStartSyncFlare(
             sync_start_util::GetFlareForSyncableService(profile_path));
   AutofillProfileSyncableService::CreateForWebDataServiceAndBackend(
-      autofill_web_data.get(), autofill_backend, app_locale);
-  AutofillProfileSyncableService::FromWebDataService(autofill_web_data.get())
+      autofill_web_data, autofill_backend, app_locale);
+  AutofillProfileSyncableService::FromWebDataService(autofill_web_data)
       ->InjectStartSyncFlare(
             sync_start_util::GetFlareForSyncableService(profile_path));
 }
 
 }  // namespace
 
 WebDataServiceWrapper::WebDataServiceWrapper() {}
 
 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) {
   base::FilePath profile_path = profile->GetPath();
@@ skipping 17 matching lines @@
       scoped_ptr<WebDatabaseTable>(new TokenServiceTable()));
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new WebAppsTable()));
   // TODO(thakis): Add a migration to delete the SQL table used by
   // 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_.reset(new AutofillWebDataService(
+      web_database_, base::Bind(&ProfileErrorCallback)));
   autofill_web_data_->Init();
 
-  token_web_data_ = new TokenWebData(
-      web_database_, base::Bind(&ProfileErrorCallback));
+  token_web_data_.reset(new TokenWebData(
+      web_database_, base::Bind(&ProfileErrorCallback)));
   token_web_data_->Init();
 
   web_data_ = new WebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   web_data_->Init();
 
   autofill_web_data_->GetAutofillBackend(
          base::Bind(&InitSyncableServicesOnDBThread,
-                    autofill_web_data_,
+                    autofill_web_data_.get(),
                     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() {
+AutofillWebDataService* WebDataServiceWrapper::GetAutofillWebData() {
   return autofill_web_data_.get();
 }
 
 scoped_refptr<WebDataService> WebDataServiceWrapper::GetWebData() {
   return web_data_.get();
 }
 
-scoped_refptr<TokenWebData> WebDataServiceWrapper::GetTokenWebData() {
+TokenWebData* WebDataServiceWrapper::GetTokenWebData() {
   return token_web_data_.get();
 }
 
 // static
-scoped_refptr<AutofillWebDataService>
+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);
+  return NULL;
 }
 
 // static
-scoped_refptr<TokenWebData> TokenWebData::FromBrowserContext(
+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);
+  return 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(
@@ skipping 46 matching lines @@
 }
 
 BrowserContextKeyedService* WebDataServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }