Index: chrome/browser/webdata/web_data_service_win.cc |
diff --git a/chrome/browser/webdata/web_data_service_win.cc b/chrome/browser/webdata/web_data_service_win.cc |
index 00a34e6ed45d234b2abccb22cdfd35a0426c9d2c..e0e1624869e557ee6c139733c5eb91b203f6ebe9 100644 |
--- a/chrome/browser/webdata/web_data_service_win.cc |
+++ b/chrome/browser/webdata/web_data_service_win.cc |
@@ -2,46 +2,50 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/webdata/logins_table.h" |
#include "chrome/browser/webdata/web_data_service.h" |
#include "base/bind.h" |
#include "chrome/browser/password_manager/ie7_password.h" |
-#include "chrome/browser/webdata/web_database.h" |
+#include "chrome/browser/webdata/logins_table.h" |
+#include "chrome/browser/webdata/web_database_service.h" |
using base::Bind; |
void WebDataService::AddIE7Login(const IE7PasswordInfo& info) { |
- ScheduleDBTask(FROM_HERE, |
- Bind(&WebDataService::AddIE7LoginImpl, this, info)); |
+ wdbs_->ScheduleDBTask( |
+ FROM_HERE, Bind(&WebDataService::AddIE7LoginImpl, this, info)); |
} |
void WebDataService::RemoveIE7Login(const IE7PasswordInfo& info) { |
- ScheduleDBTask(FROM_HERE, |
- Bind(&WebDataService::RemoveIE7LoginImpl, this, info)); |
+ wdbs_->ScheduleDBTask( |
+ FROM_HERE, Bind(&WebDataService::RemoveIE7LoginImpl, this, info)); |
} |
WebDataService::Handle WebDataService::GetIE7Login( |
const IE7PasswordInfo& info, |
WebDataServiceConsumer* consumer) { |
- return ScheduleDBTaskWithResult(FROM_HERE, |
- Bind(&WebDataService::GetIE7LoginImpl, this, info), consumer); |
+ return wdbs_->ScheduleDBTaskWithResult( |
+ FROM_HERE, Bind(&WebDataService::GetIE7LoginImpl, this, info), consumer); |
} |
-void WebDataService::AddIE7LoginImpl(const IE7PasswordInfo& info) { |
- if (db_->GetLoginsTable()->AddIE7Login(info)) |
- ScheduleCommit(); |
+WebDatabase::State WebDataService::AddIE7LoginImpl( |
+ const IE7PasswordInfo& info, WebDatabase* db) { |
+ if (db->GetLoginsTable()->AddIE7Login(info)) |
+ return WebDatabase::COMMIT_NEEDED; |
+ return WebDatabase::COMMIT_NOT_NEEDED; |
} |
-void WebDataService::RemoveIE7LoginImpl(const IE7PasswordInfo& info) { |
- if (db_->GetLoginsTable()->RemoveIE7Login(info)) |
- ScheduleCommit(); |
+WebDatabase::State WebDataService::RemoveIE7LoginImpl( |
+ const IE7PasswordInfo& info, WebDatabase* db) { |
+ if (db->GetLoginsTable()->RemoveIE7Login(info)) |
+ return WebDatabase::COMMIT_NEEDED; |
+ return WebDatabase::COMMIT_NOT_NEEDED; |
} |
scoped_ptr<WDTypedResult> WebDataService::GetIE7LoginImpl( |
- const IE7PasswordInfo& info) { |
+ const IE7PasswordInfo& info, WebDatabase* db) { |
IE7PasswordInfo result; |
- db_->GetLoginsTable()->GetIE7Login(info, &result); |
+ db->GetLoginsTable()->GetIE7Login(info, &result); |
return scoped_ptr<WDTypedResult>( |
new WDResult<IE7PasswordInfo>(PASSWORD_IE7_RESULT, result)); |
} |