Move creation of WebDatabaseTable subclasses to WebDatabaseServiceFactory.

chrome/browser/api/webdata/web_data_service_base.h

 // 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.
 
 #ifndef CHROME_BROWSER_API_WEBDATA_WEB_DATA_SERVICE_BASE_H_
 #define CHROME_BROWSER_API_WEBDATA_WEB_DATA_SERVICE_BASE_H_
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "sql/init_status.h"
 
 class WebDatabase;
 class WebDatabaseService;
+class WebDatabaseTable;
 
 namespace base {
 class Thread;
 }
 
 // Base for WebDataService class hierarchy.
 class WebDataServiceBase
     : public base::RefCountedThreadSafe<WebDataServiceBase,
           content::BrowserThread::DeleteOnUIThread> {
  public:
@@ skipping 16 matching lines @@
   virtual void CancelRequest(Handle h);
 
   // Returns the notification source for this service. This may use a
   // pointer other than this object's |this| pointer.
   virtual content::NotificationSource GetNotificationSource();
 
   // Shutdown the web data service. The service can no longer be used after this
   // call.
   virtual void ShutdownOnUIThread();
 
+  // Adds the given table to the database. Passes ownership. Must be
+  // called for all tables before Init.
+  //
+  // TODO(joi): This method is duplicated a couple of layers deep;
+  // once we have a single object creating the WebDatabaseService as
+  // well as all the XyzWebDataService objects, we should be able to
+  // simplify.
+  void AddTable(scoped_ptr<WebDatabaseTable> table);
+
   // Initializes the web data service.
   virtual void Init(const base::FilePath& path);
 
   // Unloads the database without actually shutting down the service.  This can
   // be used to temporarily reduce the browser process' memory footprint.
   void UnloadDatabase();
 
   // Unloads the database permanently and shuts down service.
   void ShutdownDatabase();
 
@@ skipping 45 matching lines @@
   // be used e.g. for SyncableService subclasses that need to be owned
   // by this object. Is created on first call to |GetDBUserData()|.
   scoped_ptr<SupportsUserDataAggregatable> db_thread_user_data_;
 
   void DBInitFailed(sql::InitStatus sql_status);
   void NotifyDatabaseLoadedOnUIThread();
   void DatabaseInitOnDB(sql::InitStatus status);
 };
 
 #endif  // CHROME_BROWSER_API_WEBDATA_WEB_DATA_SERVICE_BASE_H_