Skip to content

Commit

Permalink
Removing MessageLoop::QuitTask() from chrome_frame/
Browse files Browse the repository at this point in the history
base/task.h is going away and being replaced by base/bind.h and base/callback.h.
This CL was automatically generated by sed.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/8879033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113920 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
dcheng@chromium.org committed Dec 10, 2011
1 parent e1b16b8 commit 84e6cea
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion chrome_frame/delete_chrome_history.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ STDMETHODIMP DeleteChromeHistory::DeleteBrowsingHistory(DWORD flags) {
remove_mask_ |= BrowsingDataRemover::REMOVE_HISTORY;

loop_.PostDelayedTask(FROM_HERE,
new MessageLoop::QuitTask, 1000 * 600);
MessageLoop::QuitClosure(), 1000 * 600);
loop_.MessageLoop::Run();

return S_OK;
Expand Down
10 changes: 5 additions & 5 deletions chrome_frame/test/chrome_frame_automation_mock.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
// 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.

Expand All @@ -16,7 +16,7 @@ TEST(ChromeFrame, FLAKY_Launch) {
MessageLoopForUI loop;
AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);

loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

mock_launch.Navigate("about:blank");
loop.RunWithDispatcher(NULL);
Expand All @@ -27,7 +27,7 @@ TEST(ChromeFrame, Navigate) {
MessageLoopForUI loop;
AutomationMockNavigate mock_navigate(&loop, kLongWaitTimeout);

loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

mock_navigate.NavigateRelativeFile(L"postmessage_basic_frame.html");
loop.RunWithDispatcher(NULL);
Expand All @@ -38,7 +38,7 @@ TEST(ChromeFrame, PostMessage) {
MessageLoopForUI loop;
AutomationMockPostMessage mock_postmessage(&loop, kLongWaitTimeout);

loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

mock_postmessage.NavigateRelativeFile(L"postmessage_basic_frame.html");
loop.RunWithDispatcher(NULL);
Expand All @@ -52,7 +52,7 @@ TEST(ChromeFrame, FLAKY_RequestStart) {
AutomationMockHostNetworkRequestStart mock_request_start(&loop,
kLongWaitTimeout);

loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);

mock_request_start.NavigateRelative(L"postmessage_basic_frame.html");
loop.RunWithDispatcher(NULL);
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/chrome_frame_automation_mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class AutomationMockDelegate
void QuitMessageLoop() {
// Quit on the caller message loop has to be called on the caller
// thread.
caller_message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask);
caller_message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
}

private:
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/net/fake_external_tab.cc
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ void CFUrlRequestUnittestRunner::TakeDownBrowser(

me->ShutDownHostBrowser();
me->fake_chrome_.ui_loop()->PostDelayedTask(FROM_HERE,
new MessageLoop::QuitTask,
MessageLoop::QuitClosure(),
TestTimeouts::tiny_timeout_ms());
}

Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/test_server_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ struct QuitMessageHit {

void QuitMessageLoop(QuitMessageHit* msg) {
msg->hit_ = true;
msg->loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask);
msg->loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
}

} // end namespace
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/test_with_web_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ void MockWebServer::HandlePostedResponse(
posted_result_ = request.content();
if (posted_result_ == expected_result_) {
MessageLoop::current()->PostDelayedTask(FROM_HERE,
new MessageLoop::QuitTask,
MessageLoop::QuitClosure(),
100);
}
connection->Send("HTTP/1.1 200 OK\r\n", "");
Expand Down

0 comments on commit 84e6cea

Please sign in to comment.