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

Unified Diff: chrome_frame/test/test_server_test.cc

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/test_server.cc ('k') | chrome_frame/test/urlmon_moniker_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/test_server_test.cc
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index f893e7a10eb81d57932b9587a3a8ded772d9505c..783149bb0669c2bc047bc4e009b5c5b0bd638957 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -79,14 +79,14 @@ class UrlTaskChain {
void Run() {
EXPECT_EQ(0, delegate_.response_started_count());
- MessageLoopForIO loop;
+ base::MessageLoopForIO loop;
net::TestURLRequestContext context;
TestURLRequest r(GURL(url_), &delegate_, &context);
r.Start();
EXPECT_TRUE(r.is_pending());
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(1, delegate_.response_started_count());
EXPECT_FALSE(delegate_.received_data_before_response());
@@ -118,16 +118,16 @@ DWORD WINAPI FetchUrl(void* param) {
}
struct QuitMessageHit {
- explicit QuitMessageHit(MessageLoopForUI* loop) : loop_(loop), hit_(false) {
- }
+ explicit QuitMessageHit(base::MessageLoopForUI* loop)
+ : loop_(loop), hit_(false) {}
- MessageLoopForUI* loop_;
+ base::MessageLoopForUI* loop_;
bool hit_;
};
void QuitMessageLoop(QuitMessageHit* msg) {
msg->hit_ = true;
- msg->loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+ msg->loop_->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
}
} // end namespace
@@ -135,7 +135,7 @@ void QuitMessageLoop(QuitMessageHit* msg) {
TEST_F(TestServerTest, TestServer) {
// The web server needs a loop to exist on this thread during construction
// the loop must be created before we construct the server.
- MessageLoopForUI loop;
+ base::MessageLoopForUI loop;
test_server::SimpleWebServer server(1337);
test_server::SimpleWebServer redirected_server(server.host(), 1338);
@@ -177,7 +177,7 @@ TEST_F(TestServerTest, TestServer) {
DWORD tid = 0;
base::win::ScopedHandle worker(::CreateThread(
NULL, 0, FetchUrl, &redir_task, 0, &tid));
- loop.MessageLoop::Run();
+ loop.base::MessageLoop::Run();
EXPECT_FALSE(quit_msg.hit_);
if (!quit_msg.hit_) {
« no previous file with comments | « chrome_frame/test/test_server.cc ('k') | chrome_frame/test/urlmon_moniker_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698