Adds RefCountedDeleteOnMessageLoop

components/webdata/common/web_database_service.h

 // Copyright 2013 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted_delete_on_message_loop.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/observer_list.h"
 #include "components/webdata/common/web_data_service_base.h"
 #include "components/webdata/common/web_database.h"
 #include "components/webdata/common/webdata_export.h"
 
 class WebDataServiceBackend;
 class WebDataRequestManager;
 
 namespace content {
 class BrowserContext;
 }
 
 namespace tracked_objects {
 class Location;
 }
 
 class WDTypedResult;
 class WebDataServiceConsumer;
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDatabaseService defines the interface to a generic data repository
 // responsible for controlling access to the web database (metadata associated
 // with web pages).
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class WEBDATA_EXPORT WebDatabaseService
-    : public base::RefCountedThreadSafe<
-          WebDatabaseService,
-          content::BrowserThread::DeleteOnUIThread> {
+    : public base::RefCountedDeleteOnMessageLoop<WebDatabaseService> {
  public:
   typedef base::Callback<scoped_ptr<WDTypedResult>(WebDatabase*)> ReadTask;
   typedef base::Callback<WebDatabase::State(WebDatabase*)> WriteTask;
 
   // Takes the path to the WebDatabase file.
-  explicit WebDatabaseService(const base::FilePath& path);
+  WebDatabaseService(const base::FilePath& path,
+                     const scoped_refptr<base::MessageLoopProxy>& ui_thread);
 
   // Adds |table| as a WebDatabaseTable that will participate in
   // managing the database, transferring ownership. All calls to this
   // method must be made before |LoadDatabase| is called.
   virtual void AddTable(scoped_ptr<WebDatabaseTable> table);
 
   // Initializes the web database service.
   virtual void LoadDatabase();
 
   // Unloads the database without actually shutting down the service.  This can
@@ skipping 38 matching lines @@
   // (following a database load failure), then cleared.
   // Note: if the database load is already complete, then the callback will NOT
   // be stored or called.
   void RegisterDBErrorCallback(
       const base::Callback<void(sql::InitStatus)>& callback);
 
   bool db_loaded() { return db_loaded_; };
 
  private:
   class BackendDelegate;
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::UI>;
+  friend class BackendDelegate;
+  friend class base::RefCountedDeleteOnMessageLoop<WebDatabaseService>;
   friend class base::DeleteHelper<WebDatabaseService>;
-  // We have to friend RCTS<> so WIN shared-lib build is happy (crbug/112250).
-  friend class base::RefCountedThreadSafe<WebDatabaseService,
-      content::BrowserThread::DeleteOnUIThread>;
-  friend class BackendDelegate;
 
   virtual ~WebDatabaseService();
 
   void OnDatabaseLoadDone(sql::InitStatus status);
 
   base::FilePath path_;
 
   // The primary owner is |WebDatabaseService| but is refcounted because
   // PostTask on DB thread may outlive us.
   scoped_refptr<WebDataServiceBackend> wds_backend_;
@@ skipping 12 matching lines @@
   LoadedCallbacks loaded_callbacks_;
 
   // Callbacks to be called if the DB has failed to load.
   ErrorCallbacks error_callbacks_;
 
   // True if the WebDatabase has loaded.
   bool db_loaded_;
 };
 
 #endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_