| Index: chrome/browser/password_manager/password_store_win.cc
|
| diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
|
| index bfeee89588130b13ec03f6f0510443bd09ab5b97..65134e772e65a10776f32feaf8154b799220180c 100644
|
| --- a/chrome/browser/password_manager/password_store_win.cc
|
| +++ b/chrome/browser/password_manager/password_store_win.cc
|
| @@ -76,7 +76,7 @@ class PasswordStoreWin::DBHandler : public WebDataServiceConsumer {
|
| };
|
|
|
| PasswordStoreWin::DBHandler::~DBHandler() {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::DB);
|
| for (PendingRequestMap::const_iterator i = pending_requests_.begin();
|
| i != pending_requests_.end();
|
| ++i) {
|
| @@ -88,7 +88,7 @@ PasswordStoreWin::DBHandler::~DBHandler() {
|
| void PasswordStoreWin::DBHandler::GetIE7Login(
|
| const PasswordForm& form,
|
| const ResultCallback& result_callback) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::DB);
|
| IE7PasswordInfo info;
|
| info.url_hash =
|
| ie7_password::GetUrlHash(base::UTF8ToWide(form.origin.spec()));
|
| @@ -101,7 +101,7 @@ void PasswordStoreWin::DBHandler::GetIE7Login(
|
| ScopedVector<autofill::PasswordForm> PasswordStoreWin::DBHandler::GetIE7Results(
|
| const WDTypedResult* result,
|
| const PasswordForm& form) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::DB);
|
| ScopedVector<autofill::PasswordForm> matched_forms;
|
| const WDResult<IE7PasswordInfo>* r =
|
| static_cast<const WDResult<IE7PasswordInfo>*>(result);
|
| @@ -146,7 +146,7 @@ void PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "422460 PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone"));
|
|
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::DB);
|
|
|
| PendingRequestMap::iterator i = pending_requests_.find(handle);
|
| DCHECK(i != pending_requests_.end());
|
| @@ -181,7 +181,7 @@ PasswordStoreWin::~PasswordStoreWin() {
|
| }
|
|
|
| void PasswordStoreWin::ShutdownOnDBThread() {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| + DCHECK_CURRENTLY_ON(BrowserThread::DB);
|
| db_handler_.reset();
|
| }
|
|
|
|
|