Adds RefCountedDeleteOnMessageLoop

components/webdata/common/web_database_service.cc

 // 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.
 
 #include "components/webdata/common/web_database_service.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "components/webdata/common/web_data_request_manager.h"
 #include "components/webdata/common/web_data_results.h"
@@ skipping 20 matching lines @@
         FROM_HERE,
         base::Bind(&WebDatabaseService::OnDatabaseLoadDone,
                    web_database_service_,
                    status));
   }
  private:
   const base::WeakPtr<WebDatabaseService> web_database_service_;
 };
 
 WebDatabaseService::WebDatabaseService(
-    const base::FilePath& path)
-    : path_(path),
+    const base::FilePath& path,
+    const scoped_refptr<base::MessageLoopProxy>& ui_thread)
+    : base::RefCountedDeleteOnMessageLoop<WebDatabaseService>(ui_thread),
+      path_(path),
       weak_ptr_factory_(this),
       db_loaded_(false) {
   // WebDatabaseService should be instantiated on UI thread.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(ui_thread->BelongsToCurrentThread());
   // WebDatabaseService requires DB thread if instantiated.
   DCHECK(BrowserThread::IsWellKnownThread(BrowserThread::DB));
 }
 
 WebDatabaseService::~WebDatabaseService() {
 }
 
 void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) {
   if (!wds_backend_.get()) {
     wds_backend_ = new WebDataServiceBackend(
@@ skipping 111 matching lines @@
   } else {
     // Notify that the database load failed.
     for (size_t i = 0; i < error_callbacks_.size(); i++) {
       if (!error_callbacks_[i].is_null())
         error_callbacks_[i].Run(status);
     }
 
     error_callbacks_.clear();
   }
 }