Index: chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc |
=================================================================== |
--- chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc (revision 106378) |
+++ chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc (working copy) |
@@ -496,9 +496,9 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
@@ -519,15 +519,15 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -552,9 +552,9 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
@@ -567,9 +567,9 @@ |
CheckPasswordForms("Chrome Form Data (42)", expected); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::RemoveLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::RemoveLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
@@ -586,9 +586,9 @@ |
// First add an unrelated login. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
@@ -602,16 +602,16 @@ |
// Attempt to remove a login that doesn't exist. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::RemoveLogin, |
- base::Unretained(&backend), form_isc_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::RemoveLogin, |
+ base::Unretained(&backend), form_isc_))); |
// Make sure we can still get the first form back. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -630,13 +630,13 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
@@ -657,20 +657,20 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
// Send the same request twice with the same list both times. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -699,16 +699,16 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
// Make sure we can get the form back even when migration is failing. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -735,9 +735,9 @@ |
// Trigger the migration by looking something up. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -763,9 +763,9 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
} |
@@ -788,9 +788,9 @@ |
// Trigger the migration by looking something up. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -817,9 +817,9 @@ |
// Trigger the migration by looking something up. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -842,9 +842,9 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
} |
@@ -867,16 +867,16 @@ |
// Trigger the migration by adding a new login. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_isc_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_isc_))); |
// Look up all logins; we expect only the one we added. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -904,9 +904,9 @@ |
EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::AddLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::AddLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |
} |
@@ -929,9 +929,9 @@ |
// Trigger the migration by looking something up. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -958,9 +958,9 @@ |
// Trigger the migration by looking something up. |
std::vector<PasswordForm*> form_list; |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::GetAutofillableLogins, |
- base::Unretained(&backend), &form_list)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::GetAutofillableLogins, |
+ base::Unretained(&backend), &form_list))); |
RunDBThread(); |
@@ -975,9 +975,9 @@ |
// Now delete the password from this second profile. |
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
- base::IgnoreReturn(base::Callback<bool(void)>( |
- base::Bind(&NativeBackendKWalletStub::RemoveLogin, |
- base::Unretained(&backend), form_google_)))); |
+ base::IgnoreReturn<bool>(base::Bind( |
+ &NativeBackendKWalletStub::RemoveLogin, |
+ base::Unretained(&backend), form_google_))); |
RunDBThread(); |