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

Unified Diff: chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc

Issue 149287: Fix the unit tests that had multiple ResourceDispatcherHost objects instantia... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
===================================================================
--- chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc (revision 20012)
+++ chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc (working copy)
@@ -254,8 +254,6 @@
// Tests whether messages get canceled properly. We issue three requests,
// cancel one of them, and make sure that each sent the proper notifications.
TEST_F(ResourceDispatcherHostTest, Cancel) {
- ResourceDispatcherHost host(NULL);
-
EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(0));
MakeTestRequest(0, 0, 1, URLRequestTestJob::test_url_1());
@@ -542,37 +540,35 @@
// Test the private helper method "IncrementOutstandingRequestsMemoryCost()".
TEST_F(ResourceDispatcherHostTest, IncrementOutstandingRequestsMemoryCost) {
- ResourceDispatcherHost host(NULL);
-
// Add some counts for render_process_host=7
- EXPECT_EQ(0, host.GetOutstandingRequestsMemoryCost(7));
- EXPECT_EQ(1, host.IncrementOutstandingRequestsMemoryCost(1, 7));
- EXPECT_EQ(2, host.IncrementOutstandingRequestsMemoryCost(1, 7));
- EXPECT_EQ(3, host.IncrementOutstandingRequestsMemoryCost(1, 7));
+ EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(7));
+ EXPECT_EQ(1, host_.IncrementOutstandingRequestsMemoryCost(1, 7));
+ EXPECT_EQ(2, host_.IncrementOutstandingRequestsMemoryCost(1, 7));
+ EXPECT_EQ(3, host_.IncrementOutstandingRequestsMemoryCost(1, 7));
// Add some counts for render_process_host=3
- EXPECT_EQ(0, host.GetOutstandingRequestsMemoryCost(3));
- EXPECT_EQ(1, host.IncrementOutstandingRequestsMemoryCost(1, 3));
- EXPECT_EQ(2, host.IncrementOutstandingRequestsMemoryCost(1, 3));
+ EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(3));
+ EXPECT_EQ(1, host_.IncrementOutstandingRequestsMemoryCost(1, 3));
+ EXPECT_EQ(2, host_.IncrementOutstandingRequestsMemoryCost(1, 3));
// Remove all the counts for render_process_host=7
- EXPECT_EQ(3, host.GetOutstandingRequestsMemoryCost(7));
- EXPECT_EQ(2, host.IncrementOutstandingRequestsMemoryCost(-1, 7));
- EXPECT_EQ(1, host.IncrementOutstandingRequestsMemoryCost(-1, 7));
- EXPECT_EQ(0, host.IncrementOutstandingRequestsMemoryCost(-1, 7));
- EXPECT_EQ(0, host.GetOutstandingRequestsMemoryCost(7));
+ EXPECT_EQ(3, host_.GetOutstandingRequestsMemoryCost(7));
+ EXPECT_EQ(2, host_.IncrementOutstandingRequestsMemoryCost(-1, 7));
+ EXPECT_EQ(1, host_.IncrementOutstandingRequestsMemoryCost(-1, 7));
+ EXPECT_EQ(0, host_.IncrementOutstandingRequestsMemoryCost(-1, 7));
+ EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(7));
// Remove all the counts for render_process_host=3
- EXPECT_EQ(2, host.GetOutstandingRequestsMemoryCost(3));
- EXPECT_EQ(1, host.IncrementOutstandingRequestsMemoryCost(-1, 3));
- EXPECT_EQ(0, host.IncrementOutstandingRequestsMemoryCost(-1, 3));
- EXPECT_EQ(0, host.GetOutstandingRequestsMemoryCost(3));
+ EXPECT_EQ(2, host_.GetOutstandingRequestsMemoryCost(3));
+ EXPECT_EQ(1, host_.IncrementOutstandingRequestsMemoryCost(-1, 3));
+ EXPECT_EQ(0, host_.IncrementOutstandingRequestsMemoryCost(-1, 3));
+ EXPECT_EQ(0, host_.GetOutstandingRequestsMemoryCost(3));
// When an entry reaches 0, it should be deleted.
- EXPECT_TRUE(host.outstanding_requests_memory_cost_map_.end() ==
- host.outstanding_requests_memory_cost_map_.find(7));
- EXPECT_TRUE(host.outstanding_requests_memory_cost_map_.end() ==
- host.outstanding_requests_memory_cost_map_.find(3));
+ EXPECT_TRUE(host_.outstanding_requests_memory_cost_map_.end() ==
+ host_.outstanding_requests_memory_cost_map_.find(7));
+ EXPECT_TRUE(host_.outstanding_requests_memory_cost_map_.end() ==
+ host_.outstanding_requests_memory_cost_map_.find(3));
}
// Test that when too many requests are outstanding for a particular
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698