diff options
Diffstat (limited to 'content/browser/loader')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_unittest.cc | 23 | ||||
| -rw-r--r-- | content/browser/loader/resource_loader_unittest.cc | 9 |
2 files changed, 18 insertions, 14 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index c798b19..3cbce6f 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -1763,15 +1763,17 @@ TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsDontLeak) { // Test the private helper method "CalculateApproximateMemoryCost()". TEST_F(ResourceDispatcherHostTest, CalculateApproximateMemoryCost) { net::URLRequestContext context; - net::URLRequest req( - GURL("http://www.google.com"), net::DEFAULT_PRIORITY, NULL, &context); - EXPECT_EQ(4427, - ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(&req)); + scoped_ptr<net::URLRequest> req(context.CreateRequest( + GURL("http://www.google.com"), net::DEFAULT_PRIORITY, NULL, NULL)); + EXPECT_EQ( + 4427, + ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(req.get())); // Add 9 bytes of referrer. - req.SetReferrer("123456789"); - EXPECT_EQ(4436, - ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(&req)); + req->SetReferrer("123456789"); + EXPECT_EQ( + 4436, + ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(req.get())); // Add 33 bytes of upload content. std::string upload_content; @@ -1779,12 +1781,13 @@ TEST_F(ResourceDispatcherHostTest, CalculateApproximateMemoryCost) { std::fill(upload_content.begin(), upload_content.end(), 'x'); scoped_ptr<net::UploadElementReader> reader(new net::UploadBytesElementReader( upload_content.data(), upload_content.size())); - req.set_upload(make_scoped_ptr( + req->set_upload(make_scoped_ptr( net::UploadDataStream::CreateWithReader(reader.Pass(), 0))); // Since the upload throttling is disabled, this has no effect on the cost. - EXPECT_EQ(4436, - ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(&req)); + EXPECT_EQ( + 4436, + ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(req.get())); } // Test that too much memory for outstanding requests for a particular diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc index 1e489e8..23beced 100644 --- a/content/browser/loader/resource_loader_unittest.cc +++ b/content/browser/loader/resource_loader_unittest.cc @@ -313,10 +313,11 @@ class ResourceLoaderTest : public testing::Test, const int kRenderViewId = 2; scoped_ptr<net::URLRequest> request( - new net::URLRequest(test_url(), - net::DEFAULT_PRIORITY, - NULL, - resource_context_.GetRequestContext())); + resource_context_.GetRequestContext()->CreateRequest( + test_url(), + net::DEFAULT_PRIORITY, + NULL /* delegate */, + NULL /* cookie_store */)); raw_ptr_to_request_ = request.get(); ResourceRequestInfo::AllocateForTesting(request.get(), RESOURCE_TYPE_MAIN_FRAME, |