diff options
33 files changed, 370 insertions, 347 deletions
diff --git a/base/bind_helpers.h b/base/bind_helpers.h index df8cf82..af6ff26 100644 --- a/base/bind_helpers.h +++ b/base/bind_helpers.h @@ -130,7 +130,6 @@ #pragma once #include "base/basictypes.h" -#include "base/bind.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/template_util.h" @@ -462,11 +461,6 @@ struct MaybeRefcount<true, const T*> { static void Release(const T* o) { o->Release(); } }; -template <typename R> -void VoidReturnAdapter(Callback<R(void)> callback) { - callback.Run(); -} - // IsWeakMethod is a helper that determine if we are binding a WeakPtr<> to a // method. It is used internally by Bind() to select the correct // InvokeHelper that will no-op itself in the event the WeakPtr<> for @@ -512,12 +506,6 @@ static inline internal::PassedWrapper<T> Passed(T* scoper) { return internal::PassedWrapper<T>(scoper->Pass()); } -// -- DEPRECATED -- Use IgnoreResult instead. -template <typename R> -static inline Closure IgnoreReturn(Callback<R(void)> callback) { - return Bind(&internal::VoidReturnAdapter<R>, callback); -} - template <typename T> static inline internal::IgnoreResultHelper<T> IgnoreResult(T data) { return internal::IgnoreResultHelper<T>(data); diff --git a/chrome/browser/automation/automation_provider_gtk.cc b/chrome/browser/automation/automation_provider_gtk.cc index 60396a3..46f407a 100644 --- a/chrome/browser/automation/automation_provider_gtk.cc +++ b/chrome/browser/automation/automation_provider_gtk.cc @@ -53,12 +53,12 @@ void AutomationProvider::WindowSimulateDrag( // Create a nested stack of tasks to run. base::Closure drag_response_cb = base::Bind( &SendWindowDragResponse, make_scoped_refptr(this), reply_message); - base::Closure move_chain_cb = base::IgnoreReturn<bool>( - base::Bind(&ui_controls::SendMouseEventsNotifyWhenDone, - ui_controls::LEFT, ui_controls::UP, drag_response_cb)); - move_chain_cb = base::IgnoreReturn<bool>( - base::Bind(&ui_controls::SendMouseEventsNotifyWhenDone, - ui_controls::LEFT, ui_controls::UP, move_chain_cb)); + base::Closure move_chain_cb = base::Bind( + base::IgnoreResult(&ui_controls::SendMouseEventsNotifyWhenDone), + ui_controls::LEFT, ui_controls::UP, drag_response_cb); + move_chain_cb = base::Bind( + base::IgnoreResult(&ui_controls::SendMouseEventsNotifyWhenDone), + ui_controls::LEFT, ui_controls::UP, move_chain_cb); for (size_t i = drag_path.size() - 1; i > 0; --i) { // Smooth out the mouse movements by adding intermediate points. This // better simulates a real user drag. @@ -67,16 +67,16 @@ void AutomationProvider::WindowSimulateDrag( int half_step_x = (dest_x + drag_path[i - 1].x() + x) / 2; int half_step_y = (dest_y + drag_path[i - 1].y() + y) / 2; - move_chain_cb = base::IgnoreReturn<bool>( - base::Bind(&ui_controls::SendMouseMoveNotifyWhenDone, dest_x, dest_y, - move_chain_cb)); - move_chain_cb = base::IgnoreReturn<bool>( - base::Bind(&ui_controls::SendMouseMoveNotifyWhenDone, half_step_x, - half_step_y, move_chain_cb)); + move_chain_cb = base::Bind( + base::IgnoreResult(&ui_controls::SendMouseMoveNotifyWhenDone), + dest_x, dest_y, move_chain_cb); + move_chain_cb = base::Bind( + base::IgnoreResult(&ui_controls::SendMouseMoveNotifyWhenDone), + half_step_x, half_step_y, move_chain_cb); } - move_chain_cb = base::IgnoreReturn<bool>( - base::Bind(&ui_controls::SendMouseEventsNotifyWhenDone, - ui_controls::LEFT, ui_controls::DOWN, move_chain_cb)); + move_chain_cb = base::Bind( + base::IgnoreResult(&ui_controls::SendMouseEventsNotifyWhenDone), + ui_controls::LEFT, ui_controls::DOWN, move_chain_cb); ui_controls::SendMouseMoveNotifyWhenDone(x + drag_path[0].x(), y + drag_path[0].y(), diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index c4f1af6..d345490 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -340,8 +340,8 @@ unsigned int BrowserProcessImpl::ReleaseModule() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&base::ThreadRestrictions::SetIOAllowed, true))); + base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed), + true)); #if defined(OS_MACOSX) MessageLoop::current()->PostTask( diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index ea04841..f0434de 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -284,10 +284,11 @@ void ServicesCustomizationDocument::ReadFileInBackground(const FilePath& file) { std::string manifest; if (file_util::ReadFileToString(file, &manifest)) { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &ServicesCustomizationDocument::LoadManifestFromString, - base::Unretained(this), // this class is a singleton. - manifest))); + base::Bind( + base::IgnoreResult( + &ServicesCustomizationDocument::LoadManifestFromString), + base::Unretained(this), // this class is a singleton. + manifest)); } else { VLOG(1) << "Failed to load services customization manifest from: " << file.value(); diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 72cc836e1..2e887d2 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -562,10 +562,11 @@ bool ExternalTabContainer::CanDownload(WebContents* source, int request_id) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &AutomationResourceMessageFilter::SendDownloadRequestToHost, - automation_resource_message_filter_.get(), 0, tab_handle_, - request_id))); + base::Bind( + base::IgnoreResult( + &AutomationResourceMessageFilter::SendDownloadRequestToHost), + automation_resource_message_filter_.get(), 0, tab_handle_, + request_id)); } } else { DLOG(WARNING) << "Downloads are only supported with host browser network " diff --git a/chrome/browser/history/shortcuts_backend.cc b/chrome/browser/history/shortcuts_backend.cc index d3e100a..8d8f936 100644 --- a/chrome/browser/history/shortcuts_backend.cc +++ b/chrome/browser/history/shortcuts_backend.cc @@ -73,8 +73,9 @@ bool ShortcutsBackend::AddShortcut( if (no_db_access_) return true; return BrowserThread::PostTask( - BrowserThread::DB, FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&ShortcutsDatabase::AddShortcut, db_.get(), shortcut))); + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&ShortcutsDatabase::AddShortcut), + db_.get(), shortcut)); } bool ShortcutsBackend::UpdateShortcut( @@ -92,8 +93,9 @@ bool ShortcutsBackend::UpdateShortcut( if (no_db_access_) return true; return BrowserThread::PostTask( - BrowserThread::DB, FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&ShortcutsDatabase::UpdateShortcut, db_.get(), shortcut))); + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&ShortcutsDatabase::UpdateShortcut), + db_.get(), shortcut)); } bool ShortcutsBackend::DeleteShortcutsWithIds( @@ -113,9 +115,10 @@ bool ShortcutsBackend::DeleteShortcutsWithIds( if (no_db_access_) return true; return BrowserThread::PostTask( - BrowserThread::DB, FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&ShortcutsDatabase::DeleteShortcutsWithIds, db_.get(), - shortcut_ids))); + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&ShortcutsDatabase::DeleteShortcutsWithIds), + db_.get(), shortcut_ids)); } bool ShortcutsBackend::DeleteShortcutsWithUrl(const GURL& shortcut_url) { @@ -138,9 +141,10 @@ bool ShortcutsBackend::DeleteShortcutsWithUrl(const GURL& shortcut_url) { if (no_db_access_) return true; return BrowserThread::PostTask( - BrowserThread::DB, FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&ShortcutsDatabase::DeleteShortcutsWithUrl, db_.get(), - shortcut_url.spec()))); + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&ShortcutsDatabase::DeleteShortcutsWithUrl), + db_.get(), shortcut_url.spec())); } bool ShortcutsBackend::DeleteAllShortcuts() { @@ -153,8 +157,10 @@ bool ShortcutsBackend::DeleteAllShortcuts() { if (no_db_access_) return true; return BrowserThread::PostTask( - BrowserThread::DB, FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&ShortcutsDatabase::DeleteAllShortcuts, db_.get()))); + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&ShortcutsDatabase::DeleteAllShortcuts), + db_.get())); } void ShortcutsBackend::InitInternal() { diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index 4590d8b..1abcc8c 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -396,10 +396,10 @@ TEST_F(NativeBackendGnomeTest, BasicAddLogin) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); @@ -415,16 +415,17 @@ TEST_F(NativeBackendGnomeTest, BasicListLogins) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult( &NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -444,10 +445,10 @@ TEST_F(NativeBackendGnomeTest, BasicRemoveLogin) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); @@ -455,10 +456,10 @@ TEST_F(NativeBackendGnomeTest, BasicRemoveLogin) { if (mock_keyring_items.size() > 0) CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42"); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::RemoveLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::RemoveLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); @@ -473,10 +474,10 @@ TEST_F(NativeBackendGnomeTest, RemoveNonexistentLogin) { backend.Init(); // First add an unrelated login. - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); @@ -485,17 +486,18 @@ TEST_F(NativeBackendGnomeTest, RemoveNonexistentLogin) { 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<bool>(base::Bind( - &NativeBackendGnome::RemoveLogin, - base::Unretained(&backend), form_isc_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -515,14 +517,14 @@ TEST_F(NativeBackendGnomeTest, AddDuplicateLogin) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); @@ -538,21 +540,23 @@ TEST_F(NativeBackendGnomeTest, ListLoginsAppends) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -576,16 +580,16 @@ TEST_F(NativeBackendGnomeTest, MigrateOneLogin) { backend.Init(); BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -607,10 +611,10 @@ TEST_F(NativeBackendGnomeTest, MigrateOneLogin) { // This should not trigger migration because there will be no results. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetBlacklistLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::GetBlacklistLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -634,10 +638,11 @@ TEST_F(NativeBackendGnomeTest, MigrateOneLogin) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -665,10 +670,10 @@ TEST_F(NativeBackendGnomeTest, MigrateToMultipleProfiles) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); } @@ -686,10 +691,11 @@ TEST_F(NativeBackendGnomeTest, MigrateToMultipleProfiles) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -718,10 +724,11 @@ TEST_F(NativeBackendGnomeTest, MigrateToMultipleProfiles) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -747,10 +754,10 @@ TEST_F(NativeBackendGnomeTest, NoMigrationWithPrefSet) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); } @@ -768,17 +775,18 @@ TEST_F(NativeBackendGnomeTest, NoMigrationWithPrefSet) { backend.Init(); // Trigger the migration by adding a new login. - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_isc_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -804,10 +812,10 @@ TEST_F(NativeBackendGnomeTest, DeleteMigratedPasswordIsIsolated) { NativeBackendGnome backend(42, profile_.GetPrefs()); backend.Init(); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); } @@ -825,10 +833,11 @@ TEST_F(NativeBackendGnomeTest, DeleteMigratedPasswordIsIsolated) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -857,10 +866,11 @@ TEST_F(NativeBackendGnomeTest, DeleteMigratedPasswordIsIsolated) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendGnome::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunBothThreads(); @@ -878,10 +888,10 @@ TEST_F(NativeBackendGnomeTest, DeleteMigratedPasswordIsIsolated) { 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<bool>(base::Bind( - &NativeBackendGnome::RemoveLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendGnome::RemoveLogin), + base::Unretained(&backend), form_google_)); RunBothThreads(); diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index 5779be8..3b2a7bb 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -497,10 +497,10 @@ TEST_F(NativeBackendKWalletTest, BasicAddLogin) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); @@ -520,16 +520,17 @@ TEST_F(NativeBackendKWalletTest, BasicListLogins) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -553,10 +554,10 @@ TEST_F(NativeBackendKWalletTest, BasicRemoveLogin) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); @@ -568,10 +569,10 @@ TEST_F(NativeBackendKWalletTest, BasicRemoveLogin) { expected.push_back(make_pair(std::string(form_google_.signon_realm), forms)); CheckPasswordForms("Chrome Form Data (42)", expected); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::RemoveLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::RemoveLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); @@ -587,10 +588,10 @@ TEST_F(NativeBackendKWalletTest, RemoveNonexistentLogin) { EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); // First add an unrelated login. - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); @@ -603,17 +604,18 @@ TEST_F(NativeBackendKWalletTest, RemoveNonexistentLogin) { CheckPasswordForms("Chrome Form Data (42)", expected); // Attempt to remove a login that doesn't exist. - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::RemoveLogin, - base::Unretained(&backend), form_isc_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -631,14 +633,14 @@ TEST_F(NativeBackendKWalletTest, AddDuplicateLogin) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); @@ -658,21 +660,23 @@ TEST_F(NativeBackendKWalletTest, ListLoginsAppends) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -700,17 +704,19 @@ TEST_F(NativeBackendKWalletTest, MigrateOneLogin) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -736,10 +742,12 @@ TEST_F(NativeBackendKWalletTest, MigrateOneLogin) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -764,10 +772,10 @@ TEST_F(NativeBackendKWalletTest, MigrateToMultipleProfiles) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); } @@ -789,10 +797,12 @@ TEST_F(NativeBackendKWalletTest, MigrateToMultipleProfiles) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -818,10 +828,12 @@ TEST_F(NativeBackendKWalletTest, MigrateToMultipleProfiles) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -843,10 +855,10 @@ TEST_F(NativeBackendKWalletTest, NoMigrationWithPrefSet) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); } @@ -868,17 +880,19 @@ TEST_F(NativeBackendKWalletTest, NoMigrationWithPrefSet) { EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); // Trigger the migration by adding a new login. - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_isc_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind(base::IgnoreResult(&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<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -905,10 +919,11 @@ TEST_F(NativeBackendKWalletTest, DeleteMigratedPasswordIsIsolated) { NativeBackendKWalletStub backend(42, profile_.GetPrefs()); EXPECT_TRUE(backend.InitWithBus(mock_session_bus_)); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::AddLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendKWalletStub::AddLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); } @@ -930,10 +945,12 @@ TEST_F(NativeBackendKWalletTest, DeleteMigratedPasswordIsIsolated) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -959,10 +976,12 @@ TEST_F(NativeBackendKWalletTest, DeleteMigratedPasswordIsIsolated) { // Trigger the migration by looking something up. std::vector<PasswordForm*> form_list; - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::GetAutofillableLogins, - base::Unretained(&backend), &form_list))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult( + &NativeBackendKWalletStub::GetAutofillableLogins), + base::Unretained(&backend), &form_list)); RunDBThread(); @@ -976,10 +995,11 @@ TEST_F(NativeBackendKWalletTest, DeleteMigratedPasswordIsIsolated) { CheckPasswordForms("Chrome Form Data (24)", expected); // Now delete the password from this second profile. - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &NativeBackendKWalletStub::RemoveLogin, - base::Unretained(&backend), form_google_))); + BrowserThread::PostTask( + BrowserThread::DB, FROM_HERE, + base::Bind( + base::IgnoreResult(&NativeBackendKWalletStub::RemoveLogin), + base::Unretained(&backend), form_google_)); RunDBThread(); diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 61c3c2f..780c80d 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -619,16 +619,16 @@ TEST_P(PasswordStoreXTest, NativeMigration) { for (VectorOfForms::iterator it = expected_autofillable.begin(); it != expected_autofillable.end(); ++it) { BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &LoginDatabase::AddLogin, - base::Unretained(login_db), **it))); + base::Bind( + base::IgnoreResult(&LoginDatabase::AddLogin), + base::Unretained(login_db), **it)); } for (VectorOfForms::iterator it = expected_blacklisted.begin(); it != expected_blacklisted.end(); ++it) { BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind( - &LoginDatabase::AddLogin, - base::Unretained(login_db), **it))); + base::Bind( + base::IgnoreResult(&LoginDatabase::AddLogin), + base::Unretained(login_db), **it)); } // Schedule another task on the DB thread to notify us that it's safe to diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 8f211e2..256bb25 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -125,9 +125,9 @@ void ShowItemInFolder(const FilePath& full_path) { void OpenItem(const FilePath& full_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&ui::win::OpenItemViaShell, - full_path))); + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, + base::Bind(base::IgnoreResult(&ui::win::OpenItemViaShell), full_path)); } void OpenExternal(const GURL& url) { diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index cdef23c..a6408cb 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -154,7 +154,7 @@ static const int kCreateSessionServiceDelayMS = 500; // Helper method needed because PostTask cannot currently take a Callback // function with non-void return type. -// TODO(jhawkins): Remove once IgnoreReturn is fixed. +// TODO(jhawkins): Remove once IgnoreResult is fixed. void CreateDirectoryNoResult(const FilePath& path) { file_util::CreateDirectory(path); } diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 5f24011..7d598c3 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -67,8 +67,7 @@ class ProfileManager : public ::ProfileManagerWithoutInit { // This is safe while all file operations are done on the FILE thread. BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&file_util::CreateDirectory, - path))); + base::Bind(base::IgnoreResult(&file_util::CreateDirectory), path)); return new TestingProfile(path, this); } diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index 5259ae9..91f447c 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -399,8 +399,8 @@ bool RLZTracker::ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) { string16* not_used = NULL; BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&RLZTracker::GetAccessPointRlz, point, not_used))); + base::Bind(base::IgnoreResult(&RLZTracker::GetAccessPointRlz), point, + not_used)); return true; } diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 17c3571..3d01877 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -657,9 +657,9 @@ bool SafeBrowsingService::MakeDatabaseAvailable() { DCHECK(enabled_); if (DatabaseAvailable()) return true; - safe_browsing_thread_->message_loop()->PostTask(FROM_HERE, - base::IgnoreReturn<SafeBrowsingDatabase*>( - base::Bind(&SafeBrowsingService::GetDatabase, this))); + safe_browsing_thread_->message_loop()->PostTask( + FROM_HERE, + base::Bind(base::IgnoreResult(&SafeBrowsingService::GetDatabase), this)); return false; } diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 123b07e..364b070 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -333,8 +333,7 @@ bool DefaultBrowserInfoBarDelegate::Accept() { BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&ShellIntegration::SetAsDefaultBrowser))); + base::Bind(base::IgnoreResult(&ShellIntegration::SetAsDefaultBrowser))); return true; } @@ -1449,16 +1448,16 @@ void BrowserInit::LaunchWithProfile::CheckDefaultBrowser(Profile* profile) { prefs::kDefaultBrowserSettingEnabled)) { BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&ShellIntegration::SetAsDefaultBrowser))); + base::Bind( + base::IgnoreResult(&ShellIntegration::SetAsDefaultBrowser))); } else { // TODO(pastarmovj): We can't really do anything meaningful here yet but // just prevent showing the infobar. } return; } - BrowserThread::PostTask( - BrowserThread::FILE, FROM_HERE, base::Bind(&CheckDefaultBrowserCallback)); + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, + base::Bind(&CheckDefaultBrowserCallback)); } bool BrowserInit::LaunchWithProfile::CheckIfAutoLaunched(Profile* profile) { diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 490afdf..7f695f5a 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -170,7 +170,7 @@ void ViewEventTestBase::ScheduleMouseMoveInBackground(int x, int y) { } dnd_thread_->message_loop()->PostDelayedTask( FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&ui_controls::SendMouseMove, x, y)), + base::Bind(base::IgnoreResult(&ui_controls::SendMouseMove), x, y), kMouseMoveDelayMS); } diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc index 4174133..9e0cf33 100644 --- a/chrome_frame/cfproxy_test.cc +++ b/chrome_frame/cfproxy_test.cc @@ -122,9 +122,9 @@ struct MockCFProxyTraits : public CFProxyTraits { ASSERT_TRUE(ipc_loop != NULL); ipc_loop->PostDelayedTask( FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&IPC::Channel::Listener::OnMessageReceived, - base::Unretained(listener), m)), + base::Bind( + base::IgnoreResult(&IPC::Channel::Listener::OnMessageReceived), + base::Unretained(listener), m), t.InMilliseconds()); } @@ -360,8 +360,8 @@ TEST(SyncMsgSender, Deserialize) { // Execute replies in a worker thread. ipc.message_loop()->PostTask( FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&SyncMsgSender::OnReplyReceived, - base::Unretained(&queue), r.get()))); + base::Bind(base::IgnoreResult(&SyncMsgSender::OnReplyReceived), + base::Unretained(&queue), r.get())); ipc.Stop(); // Expect that tab 6 has been associated with the delegate. diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 5ca6dd2..44aac5a 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -989,9 +989,11 @@ bool ChromeFrameAutomationClient::ProcessUrlRequestMessage(TabProxy* tab, } PostTask( - FROM_HERE, base::IgnoreReturn<bool>(base::Bind( - &ChromeFrameAutomationClient::ProcessUrlRequestMessage, - base::Unretained(this), tab, msg, true))); + FROM_HERE, + base::Bind( + base::IgnoreResult( + &ChromeFrameAutomationClient::ProcessUrlRequestMessage), + base::Unretained(this), tab, msg, true)); return true; } diff --git a/chrome_frame/crash_reporting/nt_loader_unittest.cc b/chrome_frame/crash_reporting/nt_loader_unittest.cc index 3bc27bf..e8c575d 100644 --- a/chrome_frame/crash_reporting/nt_loader_unittest.cc +++ b/chrome_frame/crash_reporting/nt_loader_unittest.cc @@ -87,7 +87,7 @@ TEST(NtLoader, OwnsCriticalSection) { base::win::ScopedHandle event(::CreateEvent(NULL, FALSE, FALSE, NULL)); other.message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<BOOL>(base::Bind(::SetEvent, event.Get()))); + FROM_HERE, base::Bind(base::IgnoreResult(::SetEvent), event.Get())); ASSERT_EQ(WAIT_OBJECT_0, ::WaitForSingleObject(event.Get(), INFINITE)); diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h index fc57b53..81518d7 100644 --- a/chrome_frame/test/mock_ie_event_sink_actions.h +++ b/chrome_frame/test/mock_ie_event_sink_actions.h @@ -50,8 +50,8 @@ ACTION_P(CloseBrowserMock, mock) { ACTION_P3(DelayCloseBrowserMock, loop, delay, mock) { loop->PostDelayedTask( FROM_HERE, - base::IgnoreReturn<HRESULT>( - base::Bind(&IEEventSink::CloseWebBrowser, mock->event_sink())), + base::Bind(base::IgnoreResult(&IEEventSink::CloseWebBrowser), + mock->event_sink()), delay); } diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index ee0fa6b..dce42f8 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -1106,8 +1106,8 @@ void UrlmonUrlRequestManager::ReadRequest(int request_id, int bytes_to_read) { request = LookupRequest(request_id, &background_request_map_); if (request) { background_thread_->message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<bool>(base::Bind( - &UrlmonUrlRequest::Read, request.get(), bytes_to_read))); + FROM_HERE, base::Bind(base::IgnoreResult(&UrlmonUrlRequest::Read), + request.get(), bytes_to_read)); } } if (!request) @@ -1418,4 +1418,3 @@ void UrlmonUrlRequestManager::ResourceFetcherThread::Init() { void UrlmonUrlRequestManager::ResourceFetcherThread::CleanUp() { CoUninitialize(); } - diff --git a/chrome_frame/vtable_patch_manager_unittest.cc b/chrome_frame/vtable_patch_manager_unittest.cc index 2176a05..53ece2c 100644 --- a/chrome_frame/vtable_patch_manager_unittest.cc +++ b/chrome_frame/vtable_patch_manager_unittest.cc @@ -221,14 +221,13 @@ TEST_F(VtablePatchManagerTest, ThreadSafePatching) { // Instruct the background thread to patch factory_. background.message_loop()->PostTask( FROM_HERE, - base::IgnoreReturn<HRESULT>( - base::Bind(&vtable_patch::PatchInterfaceMethods, &factory_, - &IClassFactory_PatchInfo[0]))); + base::Bind(base::IgnoreResult(&vtable_patch::PatchInterfaceMethods), + &factory_, &IClassFactory_PatchInfo[0])); // And subsequently to signal the event. Neither of these actions should // occur until we've released the patch lock. background.message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<BOOL>(base::Bind(::SetEvent, event.Get()))); + FROM_HERE, base::Bind(base::IgnoreResult(::SetEvent), event.Get())); // Wait for a little while, to give the background thread time to process. // We expect this wait to time out, as the background thread should end up @@ -263,14 +262,13 @@ TEST_F(VtablePatchManagerTest, ThreadSafePatching) { // Instruct the background thread to unpatch. background.message_loop()->PostTask( FROM_HERE, - base::IgnoreReturn<HRESULT>( - base::Bind(&vtable_patch::UnpatchInterfaceMethods, - &IClassFactory_PatchInfo[0]))); + base::Bind(base::IgnoreResult(&vtable_patch::UnpatchInterfaceMethods), + &IClassFactory_PatchInfo[0])); // And subsequently to signal the event. Neither of these actions should // occur until we've released the patch lock. background.message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<BOOL>(base::Bind(::SetEvent, event.Get()))); + FROM_HERE, base::Bind(base::IgnoreResult(::SetEvent), event.Get())); // Wait for a little while, to give the background thread time to process. // We expect this wait to time out, as the background thread should end up diff --git a/content/browser/browser_message_filter.cc b/content/browser/browser_message_filter.cc index dd2414c..82600a2 100644 --- a/content/browser/browser_message_filter.cc +++ b/content/browser/browser_message_filter.cc @@ -52,8 +52,8 @@ bool BrowserMessageFilter::Send(IPC::Message* message) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&BrowserMessageFilter::Send, this, message))); + base::Bind(base::IgnoreResult(&BrowserMessageFilter::Send), this, + message)); return true; } @@ -79,8 +79,8 @@ bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) { BrowserThread::PostTask( thread, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&BrowserMessageFilter::DispatchMessage, this, message))); + base::Bind(base::IgnoreResult(&BrowserMessageFilter::DispatchMessage), + this, message)); return true; } diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc index fea3b07..eaac07b 100644 --- a/content/browser/renderer_host/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper_message_filter.cc @@ -276,12 +276,11 @@ void PepperMessageFilter::ConnectTcpOnWorkerThread(int routing_id, BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind( - &PepperMessageFilter::Send, this, - new PepperMsg_ConnectTcpACK( - routing_id, request_id, - socket_for_transit, local_addr, remote_addr)))); + base::Bind( + base::IgnoreResult(&PepperMessageFilter::Send), this, + new PepperMsg_ConnectTcpACK( + routing_id, request_id, + socket_for_transit, local_addr, remote_addr))); } // TODO(vluu): Eliminate duplication between this and @@ -302,12 +301,11 @@ void PepperMessageFilter::ConnectTcpAddressOnWorkerThread( BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind( - &PepperMessageFilter::Send, this, - new PepperMsg_ConnectTcpACK( - routing_id, request_id, - socket_for_transit, local_addr, remote_addr)))); + base::Bind( + base::IgnoreResult(&PepperMessageFilter::Send), this, + new PepperMsg_ConnectTcpACK( + routing_id, request_id, + socket_for_transit, local_addr, remote_addr))); } #endif // ENABLE_FLAPPER_HACKS diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 09cb4fc..91c5795 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -849,8 +849,8 @@ void RenderMessageFilter::AsyncOpenFileOnFileThread(const FilePath& path, IPC::Message* reply = new ViewMsg_AsyncOpenFile_ACK( routing_id, error_code, file_for_transit, message_id); BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, base::IgnoreReturn<bool>(base::Bind( - &RenderMessageFilter::Send, this, reply))); + BrowserThread::IO, FROM_HERE, + base::Bind(base::IgnoreResult(&RenderMessageFilter::Send), this, reply)); } void RenderMessageFilter::OnMediaLogEvent(const media::MediaLogEvent& event) { diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index e4522e7..39ab6be 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -609,8 +609,8 @@ void RenderWidgetHostViewWin::CleanupCompositorWindow() { BrowserThread::PostDelayedTask( BrowserThread::UI, FROM_HERE, - base::IgnoreReturn<BOOL>( - base::Bind(&::DestroyWindow, compositor_host_window_)), + base::Bind(base::IgnoreResult(&::DestroyWindow), + compositor_host_window_), kDestroyCompositorHostWindowDelay); compositor_host_window_ = NULL; diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc index f472d92..097cb93 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc @@ -151,8 +151,8 @@ bool UtilityProcessHost::StartProcess() { bool UtilityProcessHost::OnMessageReceived(const IPC::Message& message) { BrowserThread::PostTask( client_thread_id_, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&Client::OnMessageReceived, client_.get(), message))); + base::Bind(base::IgnoreResult(&Client::OnMessageReceived), + client_.get(), message)); return true; } diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc index 88f7107..4419844 100644 --- a/content/public/browser/browser_message_filter.cc +++ b/content/public/browser/browser_message_filter.cc @@ -53,8 +53,8 @@ bool BrowserMessageFilter::Send(IPC::Message* message) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&BrowserMessageFilter::Send, this, message))); + base::Bind(base::IgnoreResult(&BrowserMessageFilter::Send), this, + message)); return true; } @@ -80,8 +80,8 @@ bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) { BrowserThread::PostTask( thread, FROM_HERE, - base::IgnoreReturn<bool>( - base::Bind(&BrowserMessageFilter::DispatchMessage, this, message))); + base::Bind(base::IgnoreResult(&BrowserMessageFilter::DispatchMessage), + this, message)); return true; } diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc index aaccf9f..70ad606 100644 --- a/content/renderer/media/audio_input_message_filter.cc +++ b/content/renderer/media/audio_input_message_filter.cc @@ -31,8 +31,8 @@ bool AudioInputMessageFilter::Send(IPC::Message* message) { // safe. ChildProcess::current()->io_message_loop()->PostTask( FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&AudioInputMessageFilter::Send, - this, message))); + base::Bind(base::IgnoreResult(&AudioInputMessageFilter::Send), this, + message)); return true; } diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc index 628ea8d..93e1529 100644 --- a/content/renderer/media/audio_message_filter.cc +++ b/content/renderer/media/audio_message_filter.cc @@ -31,8 +31,8 @@ bool AudioMessageFilter::Send(IPC::Message* message) { // safe. ChildProcess::current()->io_message_loop()->PostTask( FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&AudioMessageFilter::Send, - this, message))); + base::Bind(base::IgnoreResult(&AudioMessageFilter::Send), this, + message)); return true; } diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc index b7a6970..06f3150 100644 --- a/content/renderer/media/video_capture_impl.cc +++ b/content/renderer/media/video_capture_impl.cc @@ -431,8 +431,8 @@ void VideoCaptureImpl::Send(IPC::Message* message) { ChildProcess::current()->io_message_loop_proxy(); io_message_loop_proxy->PostTask(FROM_HERE, - base::IgnoreReturn<bool>(base::Bind(&VideoCaptureMessageFilter::Send, - message_filter_.get(), message))); + base::Bind(base::IgnoreResult(&VideoCaptureMessageFilter::Send), + message_filter_.get(), message)); } bool VideoCaptureImpl::ClientHasDIB() { diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index 4728997..e7903f4 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -1136,9 +1136,8 @@ class ServerSendAfterClose : public Worker { bool SendDummy() { ListenerThread()->message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&ServerSendAfterClose::Send, this, - new SyncChannelTestMsg_NoArgs))); + FROM_HERE, base::Bind(base::IgnoreResult(&ServerSendAfterClose::Send), + this, new SyncChannelTestMsg_NoArgs)); return true; } diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc index 9ce6ce6..a47fffb 100644 --- a/webkit/tools/test_shell/simple_appcache_system.cc +++ b/webkit/tools/test_shell/simple_appcache_system.cc @@ -267,8 +267,9 @@ class SimpleBackendProxy status_result_ = appcache::UNCACHED; event_.Reset(); system_->io_message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<appcache::Status>( - base::Bind(&SimpleBackendProxy::GetStatus, this, host_id))); + FROM_HERE, + base::Bind(base::IgnoreResult(&SimpleBackendProxy::GetStatus), + this, host_id)); event_.Wait(); } else if (system_->is_io_thread()) { system_->backend_impl_->GetStatusWithCallback( @@ -284,8 +285,9 @@ class SimpleBackendProxy bool_result_ = false; event_.Reset(); system_->io_message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&SimpleBackendProxy::StartUpdate, this, host_id))); + FROM_HERE, + base::Bind(base::IgnoreResult(&SimpleBackendProxy::StartUpdate), + this, host_id)); event_.Wait(); } else if (system_->is_io_thread()) { system_->backend_impl_->StartUpdateWithCallback( @@ -301,8 +303,9 @@ class SimpleBackendProxy bool_result_ = false; event_.Reset(); system_->io_message_loop()->PostTask( - FROM_HERE, base::IgnoreReturn<bool>( - base::Bind(&SimpleBackendProxy::SwapCache, this, host_id))); + FROM_HERE, + base::Bind(base::IgnoreResult(&SimpleBackendProxy::SwapCache), + this, host_id)); event_.Wait(); } else if (system_->is_io_thread()) { system_->backend_impl_->SwapCacheWithCallback( |