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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 1395103003: Don't use base::MessageLoop::{Quit,QuitClosure} in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 #include <queue> 6 #include <queue>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 GURL redirect_url("about:redirected"); 458 GURL redirect_url("about:redirected");
459 response->new_url = redirect_url; 459 response->new_url = redirect_url;
460 ipc_sender_.PushTask( 460 ipc_sender_.PushTask(
461 base::Bind(&EventHandledOnIOThread, 461 base::Bind(&EventHandledOnIOThread,
462 &profile_, extension_id, kEventName, kEventName + "/1", 462 &profile_, extension_id, kEventName, kEventName + "/1",
463 request->identifier(), response)); 463 request->identifier(), response));
464 464
465 // Extension response for OnErrorOccurred: Terminate the message loop. 465 // Extension response for OnErrorOccurred: Terminate the message loop.
466 ipc_sender_.PushTask( 466 ipc_sender_.PushTask(
467 base::Bind(&base::MessageLoop::PostTask, 467 base::Bind(&base::MessageLoop::PostTask,
468 base::Unretained(base::MessageLoop::current()), 468 base::Unretained(base::MessageLoop::current()), FROM_HERE,
469 FROM_HERE, base::MessageLoop::QuitClosure())); 469 base::MessageLoop::QuitWhenIdleClosure()));
470 470
471 request->Start(); 471 request->Start();
472 // request->Start() will have submitted OnBeforeRequest by the time we cancel. 472 // request->Start() will have submitted OnBeforeRequest by the time we cancel.
473 request->Cancel(); 473 request->Cancel();
474 base::MessageLoop::current()->Run(); 474 base::MessageLoop::current()->Run();
475 475
476 EXPECT_TRUE(!request->is_pending()); 476 EXPECT_TRUE(!request->is_pending());
477 EXPECT_EQ(net::URLRequestStatus::CANCELED, request->status().status()); 477 EXPECT_EQ(net::URLRequestStatus::CANCELED, request->status().status());
478 EXPECT_EQ(net::ERR_ABORTED, request->status().error()); 478 EXPECT_EQ(net::ERR_ABORTED, request->status().error());
479 EXPECT_EQ(request_url, request->url()); 479 EXPECT_EQ(request_url, request->url());
(...skipping 1768 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 EXPECT_TRUE(credentials_set); 2248 EXPECT_TRUE(credentials_set);
2249 EXPECT_FALSE(auth3.Empty()); 2249 EXPECT_FALSE(auth3.Empty());
2250 EXPECT_EQ(username, auth1.username()); 2250 EXPECT_EQ(username, auth1.username());
2251 EXPECT_EQ(password, auth1.password()); 2251 EXPECT_EQ(password, auth1.password());
2252 EXPECT_EQ(1u, warning_set.size()); 2252 EXPECT_EQ(1u, warning_set.size());
2253 EXPECT_TRUE(HasWarning(warning_set, "extid2")); 2253 EXPECT_TRUE(HasWarning(warning_set, "extid2"));
2254 EXPECT_EQ(3u, capturing_net_log.GetSize()); 2254 EXPECT_EQ(3u, capturing_net_log.GetSize());
2255 } 2255 }
2256 2256
2257 } // namespace extensions 2257 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698