Index: components/webdata/common/web_database_service.cc |
diff --git a/components/webdata/common/web_database_service.cc b/components/webdata/common/web_database_service.cc |
index f6a79087858016cfad064534737e1d0e8e095a46..c86b371d0adf9ee568498e9bfc7f1c91414d8838 100644 |
--- a/components/webdata/common/web_database_service.cc |
+++ b/components/webdata/common/web_database_service.cc |
@@ -8,16 +8,16 @@ |
#include "base/location.h" |
#include "components/webdata/common/web_data_request_manager.h" |
#include "components/webdata/common/web_data_results.h" |
-#include "components/webdata/common/web_data_service_backend.h" |
#include "components/webdata/common/web_data_service_consumer.h" |
+#include "components/webdata/common/web_database_backend.h" |
using base::Bind; |
using base::FilePath; |
// Receives messages from the backend on the DB thread, posts them to |
// WebDatabaseService on the UI thread. |
-class WebDatabaseService::BackendDelegate : |
- public WebDataServiceBackend::Delegate { |
+class WebDatabaseService::BackendDelegate |
+ : public WebDatabaseBackend::Delegate { |
public: |
BackendDelegate( |
const base::WeakPtr<WebDatabaseService>& web_database_service) |
@@ -57,18 +57,16 @@ WebDatabaseService::~WebDatabaseService() { |
void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) { |
if (!wds_backend_.get()) { |
- wds_backend_ = new WebDataServiceBackend( |
- path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), |
- db_thread_); |
+ wds_backend_ = new WebDatabaseBackend( |
+ path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), db_thread_); |
} |
wds_backend_->AddTable(table.Pass()); |
} |
void WebDatabaseService::LoadDatabase() { |
DCHECK(wds_backend_.get()); |
- db_thread_->PostTask( |
- FROM_HERE, |
- Bind(&WebDataServiceBackend::InitDatabase, wds_backend_)); |
+ db_thread_->PostTask(FROM_HERE, |
+ Bind(&WebDatabaseBackend::InitDatabase, wds_backend_)); |
} |
void WebDatabaseService::ShutdownDatabase() { |
@@ -79,7 +77,7 @@ void WebDatabaseService::ShutdownDatabase() { |
if (!wds_backend_.get()) |
return; |
db_thread_->PostTask( |
- FROM_HERE, Bind(&WebDataServiceBackend::ShutdownDatabase, wds_backend_)); |
+ FROM_HERE, Bind(&WebDatabaseBackend::ShutdownDatabase, wds_backend_)); |
} |
WebDatabase* WebDatabaseService::GetDatabaseOnDB() const { |
@@ -87,7 +85,7 @@ WebDatabase* WebDatabaseService::GetDatabaseOnDB() const { |
return wds_backend_.get() ? wds_backend_->database() : NULL; |
} |
-scoped_refptr<WebDataServiceBackend> WebDatabaseService::GetBackend() const { |
+scoped_refptr<WebDatabaseBackend> WebDatabaseService::GetBackend() const { |
return wds_backend_; |
} |
@@ -97,9 +95,9 @@ void WebDatabaseService::ScheduleDBTask( |
DCHECK(wds_backend_.get()); |
scoped_ptr<WebDataRequest> request( |
new WebDataRequest(NULL, wds_backend_->request_manager().get())); |
- db_thread_->PostTask(from_here, |
- Bind(&WebDataServiceBackend::DBWriteTaskWrapper, |
- wds_backend_, task, base::Passed(&request))); |
+ db_thread_->PostTask( |
+ from_here, Bind(&WebDatabaseBackend::DBWriteTaskWrapper, wds_backend_, |
+ task, base::Passed(&request))); |
} |
WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult( |
@@ -111,9 +109,9 @@ WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult( |
scoped_ptr<WebDataRequest> request( |
new WebDataRequest(consumer, wds_backend_->request_manager().get())); |
WebDataServiceBase::Handle handle = request->GetHandle(); |
- db_thread_->PostTask(from_here, |
- Bind(&WebDataServiceBackend::DBReadTaskWrapper, |
- wds_backend_, task, base::Passed(&request))); |
+ db_thread_->PostTask( |
+ from_here, Bind(&WebDatabaseBackend::DBReadTaskWrapper, wds_backend_, |
+ task, base::Passed(&request))); |
return handle; |
} |