The AutofillProfileSyncableService's lifetime should be managed by the WebDataService

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
+#include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.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/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
@@ skipping 39 matching lines @@
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
 WebDataService::WebDataService()
   : is_running_(false),
     db_(NULL),
+    autofill_profile_syncable_service_(NULL),
     failed_init_(false),
     should_commit_(false),
     next_request_handle_(1),
     main_loop_(MessageLoop::current()) {
 }
 
 // static
 void WebDataService::NotifyOfMultipleAutofillChanges(
     WebDataService* web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!web_data_service)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       Bind(&NotifyOfMultipleAutofillChangesTask,
            make_scoped_refptr(web_data_service)));
 }
 
 bool WebDataService::Init(const FilePath& profile_path) {
   FilePath path = profile_path;
   path = path.Append(chrome::kWebDataFilename);
   return InitWithPath(path);
 }
 
 void WebDataService::Shutdown() {
+  ScheduleTask(Bind(&WebDataService::ShutdownSyncableServices, this));
   UnloadDatabase();
 }
 
 bool WebDataService::IsRunning() const {
   return is_running_;
 }
 
 void WebDataService::UnloadDatabase() {
   ScheduleTask(Bind(&WebDataService::ShutdownDatabase, this));
 }
@@ skipping 417 matching lines @@
 WebDataService::~WebDataService() {
   if (is_running_ && db_) {
     DLOG_ASSERT("WebDataService dtor called without Shutdown");
   }
 }
 
 bool WebDataService::InitWithPath(const FilePath& path) {
   path_ = path;
   is_running_ = true;
   ScheduleTask(Bind(&WebDataService::InitializeDatabaseIfNecessary, this));
+  ScheduleTask(Bind(&WebDataService::InitializeSyncableServices, this));
   return true;
 }
 
 void WebDataService::RequestCompleted(Handle h) {
   pending_lock_.Acquire();
   RequestMap::iterator i = pending_requests_.find(h);
   if (i == pending_requests_.end()) {
     NOTREACHED() << "Request completed called for an unknown request";
     pending_lock_.Release();
     return;
@@ skipping 70 matching lines @@
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this, &WebDataService::NotifyDatabaseLoadedOnUIThread));
 
   db_ = db;
   db_->BeginTransaction();
 }
 
+void WebDataService::InitializeSyncableServices() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK(!autofill_profile_syncable_service_);
+
+  autofill_profile_syncable_service_ = new AutofillProfileSyncableService(this);
+}
+
 void WebDataService::NotifyDatabaseLoadedOnUIThread() {
   // Notify that the database has been initialized.
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_WEB_DATABASE_LOADED, Source<WebDataService>(this),
       NotificationService::NoDetails());
 }
 
 void WebDataService::ShutdownDatabase() {
   should_commit_ = false;
 
   if (db_) {
     db_->CommitTransaction();
     delete db_;
     db_ = NULL;
   }
 }
 
+void WebDataService::ShutdownSyncableServices() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+
+  delete autofill_profile_syncable_service_;
+  autofill_profile_syncable_service_ = NULL;
+}
+
 void WebDataService::Commit() {
   if (should_commit_) {
     should_commit_ = false;
 
     if (db_) {
       db_->CommitTransaction();
       db_->BeginTransaction();
     }
   }
 }
@@ skipping 695 matching lines @@
             Details<AutofillCreditCardChange>(&change));
       }
       // Note: It is the caller's responsibility to post notifications for any
       // changes, e.g. by calling the Refresh() method of PersonalDataManager.
       ScheduleCommit();
     }
   }
   request->RequestComplete();
 }
 
+AutofillProfileSyncableService*
+    WebDataService::GetAutofillProfileSyncableService() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK(autofill_profile_syncable_service_);  // Make sure we're initialized.
+
+  return autofill_profile_syncable_service_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataRequest implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDataService::WebDataRequest::WebDataRequest(WebDataService* service,
                                                Handle handle,
                                                WebDataServiceConsumer* consumer)
     : service_(service),
@@ skipping 31 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }