Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8964)

Unified Diff: chrome_frame/test/chrome_frame_test_utils.h

Issue 15935013: chrome_frame: Use base::MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix license Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/chrome_frame_automation_mock.cc ('k') | chrome_frame/test/chrome_frame_ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_test_utils.h
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 5d2e44c87d672b7785445e447ada59d40535c859..dbee52c532b843dd1a9aa7d2a095f2e85bd6acb4 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -211,9 +211,9 @@ class TimedMsgLoop {
if (snapshot_on_timeout_)
timeout_closure_.Reset(base::Bind(&TimedMsgLoop::SnapshotAndQuit));
else
- timeout_closure_.Reset(MessageLoop::QuitClosure());
+ timeout_closure_.Reset(base::MessageLoop::QuitClosure());
loop_.PostDelayedTask(FROM_HERE, timeout_closure_.callback(), duration);
- loop_.MessageLoop::Run();
+ loop_.base::MessageLoop::Run();
timeout_closure_.Cancel();
}
@@ -235,7 +235,7 @@ class TimedMsgLoop {
void QuitAfter(base::TimeDelta delay) {
timeout_closure_.Cancel();
quit_loop_invoked_ = true;
- loop_.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), delay);
+ loop_.PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(), delay);
}
bool WasTimedOut() const {
@@ -249,10 +249,10 @@ class TimedMsgLoop {
private:
static void SnapshotAndQuit() {
TakeSnapshotAndLog();
- MessageLoop::current()->Quit();
+ base::MessageLoop::current()->Quit();
}
- MessageLoopForUI loop_;
+ base::MessageLoopForUI loop_;
base::CancelableClosure timeout_closure_;
bool snapshot_on_timeout_;
bool quit_loop_invoked_;
« no previous file with comments | « chrome_frame/test/chrome_frame_automation_mock.cc ('k') | chrome_frame/test/chrome_frame_ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698