Use base::IgnoreReturn<bool>( instead of base::IgnoreReturn(base::Callback<bool(void)>(.

chrome/browser/password_manager/native_backend_gnome_x_unittest.cc

 // Copyright (c) 2011 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 <stdarg.h>
 
 #include "base/basictypes.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 377 matching lines @@
 };
 
 TEST_F(NativeBackendGnomeTest, BasicAddLogin) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendGnome backend(42, profile_.GetPrefs());
   backend.Init();
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::AddLogin,
+          base::Unretained(&backend), form_google_)));
 
   RunBothThreads();
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, BasicListLogins) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendGnome backend(42, profile_.GetPrefs());
   backend.Init();
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::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(&NativeBackendGnome::GetAutofillableLogins,
-                     base::Unretained(&backend), &form_list))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::GetAutofillableLogins,
+          base::Unretained(&backend), &form_list)));
 
   RunBothThreads();
 
   // Quick check that we got something back.
   EXPECT_EQ(1u, form_list.size());
   STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, BasicRemoveLogin) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendGnome backend(42, profile_.GetPrefs());
   backend.Init();
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::AddLogin,
+          base::Unretained(&backend), form_google_)));
 
   RunBothThreads();
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::RemoveLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::RemoveLogin,
+          base::Unretained(&backend), form_google_)));
 
   RunBothThreads();
 
   EXPECT_EQ(0u, mock_keyring_items.size());
 }
 
 TEST_F(NativeBackendGnomeTest, RemoveNonexistentLogin) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendGnome backend(42, profile_.GetPrefs());
   backend.Init();
 
   // First add an unrelated login.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::AddLogin,
+          base::Unretained(&backend), form_google_)));
 
   RunBothThreads();
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 
   // Attempt to remove a login that doesn't exist.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::RemoveLogin,
-                     base::Unretained(&backend), form_isc_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::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(&NativeBackendGnome::GetAutofillableLogins,
-                     base::Unretained(&backend), &form_list))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::GetAutofillableLogins,
+          base::Unretained(&backend), &form_list)));
 
   RunBothThreads();
 
   // Quick check that we got something back.
   EXPECT_EQ(1u, form_list.size());
   STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, AddDuplicateLogin) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendGnome backend(42, profile_.GetPrefs());
   backend.Init();
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::AddLogin,
+          base::Unretained(&backend), form_google_)));
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::AddLogin,
+          base::Unretained(&backend), form_google_)));
 
   RunBothThreads();
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, ListLoginsAppends) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendGnome backend(42, profile_.GetPrefs());
   backend.Init();
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::AddLogin,
-                     base::Unretained(&backend), form_google_))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::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(&NativeBackendGnome::GetAutofillableLogins,
-                     base::Unretained(&backend), &form_list))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::GetAutofillableLogins,
+          base::Unretained(&backend), &form_list)));
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::IgnoreReturn(base::Callback<bool(void)>(
-          base::Bind(&NativeBackendGnome::GetAutofillableLogins,
-                     base::Unretained(&backend), &form_list))));
+      base::IgnoreReturn<bool>(base::Bind(
+          &NativeBackendGnome::GetAutofillableLogins,
+          base::Unretained(&backend), &form_list)));
 
   RunBothThreads();
 
   // Quick check that we got two results back.
   EXPECT_EQ(2u, form_list.size());
   STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 // TODO(mdm): add more basic (i.e. non-migration) tests here at some point.
 
 TEST_F(NativeBackendGnomeTest, MigrateOneLogin) {
   // Reject attempts to migrate so we can populate the store.
   mock_keyring_reject_local_ids = true;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::AddLogin,
-                       base::Unretained(&backend), form_google_))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got something back.
     EXPECT_EQ(1u, form_list.size());
     STLDeleteElements(&form_list);
   }
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
 
   // Now allow the migration.
   mock_keyring_reject_local_ids = false;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     // This should not trigger migration because there will be no results.
     std::vector<PasswordForm*> form_list;
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::GetBlacklistLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetBlacklistLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Check that we got nothing back.
     EXPECT_EQ(0u, form_list.size());
     STLDeleteElements(&form_list);
   }
 
   // Check that the keyring is unmodified.
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
 
   // Check that we haven't set the persistent preference.
   EXPECT_FALSE(
       profile_.GetPrefs()->GetBoolean(prefs::kPasswordsUseLocalProfileId));
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     // 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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got something back.
     EXPECT_EQ(1u, form_list.size());
     STLDeleteElements(&form_list);
   }
 
   EXPECT_EQ(2u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
   if (mock_keyring_items.size() > 1)
     CheckMockKeyringItem(&mock_keyring_items[1], form_google_, "chrome-42");
 
   // Check that we have set the persistent preference.
   EXPECT_TRUE(
       profile_.GetPrefs()->GetBoolean(prefs::kPasswordsUseLocalProfileId));
 }
 
 TEST_F(NativeBackendGnomeTest, MigrateToMultipleProfiles) {
   // Reject attempts to migrate so we can populate the store.
   mock_keyring_reject_local_ids = true;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::AddLogin,
-                       base::Unretained(&backend), form_google_))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::AddLogin,
+            base::Unretained(&backend), form_google_)));
 
     RunBothThreads();
   }
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
 
   // Now allow the migration.
   mock_keyring_reject_local_ids = false;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     // 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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got something back.
     EXPECT_EQ(1u, form_list.size());
     STLDeleteElements(&form_list);
   }
 
   EXPECT_EQ(2u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
   if (mock_keyring_items.size() > 1)
     CheckMockKeyringItem(&mock_keyring_items[1], form_google_, "chrome-42");
 
   // Check that we have set the persistent preference.
   EXPECT_TRUE(
       profile_.GetPrefs()->GetBoolean(prefs::kPasswordsUseLocalProfileId));
 
   // Normally we'd actually have a different profile. But in the test just reset
   // the profile's persistent pref; we pass in the local profile id anyway.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, false);
 
   {
     NativeBackendGnome backend(24, profile_.GetPrefs());
     backend.Init();
 
     // 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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got something back.
     EXPECT_EQ(1u, form_list.size());
     STLDeleteElements(&form_list);
   }
 
   EXPECT_EQ(3u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
   if (mock_keyring_items.size() > 1)
     CheckMockKeyringItem(&mock_keyring_items[1], form_google_, "chrome-42");
   if (mock_keyring_items.size() > 2)
     CheckMockKeyringItem(&mock_keyring_items[2], form_google_, "chrome-24");
 }
 
 TEST_F(NativeBackendGnomeTest, NoMigrationWithPrefSet) {
   // Reject attempts to migrate so we can populate the store.
   mock_keyring_reject_local_ids = true;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::AddLogin,
-                       base::Unretained(&backend), form_google_))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::AddLogin,
+            base::Unretained(&backend), form_google_)));
 
     RunBothThreads();
   }
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
 
   // Now allow migration, but also pretend that the it has already taken place.
   mock_keyring_reject_local_ids = false;
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     // Trigger the migration by adding a new login.
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::AddLogin,
-                       base::Unretained(&backend), form_isc_))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got the right thing back.
     EXPECT_EQ(1u, form_list.size());
     if (form_list.size() > 0)
       EXPECT_EQ(form_isc_.signon_realm, form_list[0]->signon_realm);
     STLDeleteElements(&form_list);
   }
 
   EXPECT_EQ(2u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
   if (mock_keyring_items.size() > 1)
     CheckMockKeyringItem(&mock_keyring_items[1], form_isc_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, DeleteMigratedPasswordIsIsolated) {
   // Reject attempts to migrate so we can populate the store.
   mock_keyring_reject_local_ids = true;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::AddLogin,
-                       base::Unretained(&backend), form_google_))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::AddLogin,
+            base::Unretained(&backend), form_google_)));
 
     RunBothThreads();
   }
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
 
   // Now allow the migration.
   mock_keyring_reject_local_ids = false;
 
   {
     NativeBackendGnome backend(42, profile_.GetPrefs());
     backend.Init();
 
     // 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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got something back.
     EXPECT_EQ(1u, form_list.size());
     STLDeleteElements(&form_list);
   }
 
   EXPECT_EQ(2u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
   if (mock_keyring_items.size() > 1)
     CheckMockKeyringItem(&mock_keyring_items[1], form_google_, "chrome-42");
 
   // Check that we have set the persistent preference.
   EXPECT_TRUE(
       profile_.GetPrefs()->GetBoolean(prefs::kPasswordsUseLocalProfileId));
 
   // Normally we'd actually have a different profile. But in the test just reset
   // the profile's persistent pref; we pass in the local profile id anyway.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, false);
 
   {
     NativeBackendGnome backend(24, profile_.GetPrefs());
     backend.Init();
 
     // 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(&NativeBackendGnome::GetAutofillableLogins,
-                       base::Unretained(&backend), &form_list))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::GetAutofillableLogins,
+            base::Unretained(&backend), &form_list)));
 
     RunBothThreads();
 
     // Quick check that we got something back.
     EXPECT_EQ(1u, form_list.size());
     STLDeleteElements(&form_list);
 
     // There should be three passwords now.
     EXPECT_EQ(3u, mock_keyring_items.size());
     if (mock_keyring_items.size() > 0)
       CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
     if (mock_keyring_items.size() > 1)
       CheckMockKeyringItem(&mock_keyring_items[1], form_google_, "chrome-42");
     if (mock_keyring_items.size() > 2)
       CheckMockKeyringItem(&mock_keyring_items[2], form_google_, "chrome-24");
 
     // Now delete the password from this second profile.
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::IgnoreReturn(base::Callback<bool(void)>(
-            base::Bind(&NativeBackendGnome::RemoveLogin,
-                       base::Unretained(&backend), form_google_))));
+        base::IgnoreReturn<bool>(base::Bind(
+            &NativeBackendGnome::RemoveLogin,
+            base::Unretained(&backend), form_google_)));
 
     RunBothThreads();
 
     // The other two copies of the password in different profiles should remain.
     EXPECT_EQ(2u, mock_keyring_items.size());
     if (mock_keyring_items.size() > 0)
       CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome");
     if (mock_keyring_items.size() > 1)
       CheckMockKeyringItem(&mock_keyring_items[1], form_google_, "chrome-42");
   }
 }