diff options
author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 02:37:17 +0000 |
---|---|---|
committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 02:37:17 +0000 |
commit | dcde767184d0ab222f846123bc397738b3bcd8f7 (patch) | |
tree | 0f9a8297a8ef586214a09e2c53e9c300a31f914a /chrome_frame | |
parent | 651cea61d7994567ddd4db73012d6c9f737efee4 (diff) | |
download | chromium_src-dcde767184d0ab222f846123bc397738b3bcd8f7.zip chromium_src-dcde767184d0ab222f846123bc397738b3bcd8f7.tar.gz chromium_src-dcde767184d0ab222f846123bc397738b3bcd8f7.tar.bz2 |
Change over IgnoreReturn to IgnoreResult. remove IgnoreReturn.
BUG=98919
TEST=existing
Review URL: http://codereview.chromium.org/9111032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/cfproxy_test.cc | 10 | ||||
-rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 | ||||
-rw-r--r-- | chrome_frame/crash_reporting/nt_loader_unittest.cc | 2 | ||||
-rw-r--r-- | chrome_frame/test/mock_ie_event_sink_actions.h | 4 | ||||
-rw-r--r-- | chrome_frame/urlmon_url_request.cc | 5 | ||||
-rw-r--r-- | chrome_frame/vtable_patch_manager_unittest.cc | 14 |
6 files changed, 21 insertions, 22 deletions
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 |