Split Autofill webdata

chrome/browser/api/webdata/web_data_service_base.h

Index: chrome/browser/api/webdata/web_data_service_base.h
diff --git a/chrome/browser/api/webdata/web_data_service_base.h b/chrome/browser/api/webdata/web_data_service_base.h
index 7a91a43b58d0ffbbb17515d1f9f71f93cf6d7861..22b00b8542f7a3b6e4cfdbc26e94709b3524eda7 100644
--- a/chrome/browser/api/webdata/web_data_service_base.h
+++ b/chrome/browser/api/webdata/web_data_service_base.h
@@ -39,7 +39,13 @@ class WebDataServiceBase
 
   // |callback| will only be invoked on error, and only if
   // |callback.is_null()| evaluates to false.
-  WebDataServiceBase(const base::FilePath& path,
+  //
+  // The ownership of |wdbs| is shared, with the primary owner being the
+  // WebDataServiceWrapper, and secondary owners being subclasses of
+  // WebDataServiceBase, which receive |wdbs| upon construction. The
+  // WebDataServiceWrapper handles the initializing and shutting down and of
+  // the |wdbs| object.
+  WebDataServiceBase(scoped_refptr<WebDatabaseService> wdbs,
                      const ProfileErrorCallback& callback);
 
   // Cancel any pending request. You need to call this method if your
@@ -93,7 +99,7 @@ class WebDataServiceBase
   virtual void ShutdownOnDBThread();
 
   // Our database service.
-  scoped_ptr<WebDatabaseService> wdbs_;
+  scoped_refptr<WebDatabaseService> wdbs_;
 
   // True if we've received a notification that the WebDatabase has loaded.
   bool db_loaded_;
@@ -103,11 +109,6 @@ class WebDataServiceBase
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<WebDataServiceBase>;
 
-  // TODO(caitkp): Get rid of this once we fully split
-  // AutofillWebDataService and WebDatabaseService away from
-  // WebDataService.
-  base::FilePath path_;
-
   ProfileErrorCallback profile_error_callback_;
 
   // This makes the destructor public, and thus allows us to aggregate