summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/download/download_manager_impl.cc3
-rw-r--r--content/browser/fileapi/blob_url_request_job_unittest.cc5
-rw-r--r--content/browser/fileapi/file_system_dir_url_request_job_unittest.cc4
-rw-r--r--content/browser/fileapi/file_system_url_request_job_unittest.cc4
-rw-r--r--content/browser/fileapi/file_writer_delegate_unittest.cc9
-rw-r--r--content/browser/loader/resource_dispatcher_host_impl.cc6
-rw-r--r--content/browser/loader/resource_dispatcher_host_unittest.cc4
-rw-r--r--content/browser/loader/resource_loader_unittest.cc16
-rw-r--r--content/browser/loader/resource_scheduler_unittest.cc4
-rw-r--r--content/browser/renderer_host/render_message_filter.cc3
-rw-r--r--content/browser/streams/stream_url_request_job_unittest.cc7
11 files changed, 42 insertions, 23 deletions
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 36967c5..bd66f06 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -40,6 +40,7 @@
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/common/referrer.h"
#include "net/base/load_flags.h"
+#include "net/base/request_priority.h"
#include "net/base/upload_bytes_element_reader.h"
#include "net/base/upload_data_stream.h"
#include "net/url_request/url_request_context.h"
@@ -55,7 +56,7 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params,
// we must down cast. RDHI is the only subclass of RDH as of 2012 May 4.
scoped_ptr<net::URLRequest> request(
params->resource_context()->GetRequestContext()->CreateRequest(
- params->url(), NULL));
+ params->url(), net::DEFAULT_PRIORITY, NULL));
request->set_load_flags(request->load_flags() | params->load_flags());
request->set_method(params->method());
if (!params->post_body().empty()) {
diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc
index 90da3aa..93cacb24 100644
--- a/content/browser/fileapi/blob_url_request_job_unittest.cc
+++ b/content/browser/fileapi/blob_url_request_job_unittest.cc
@@ -12,6 +12,7 @@
#include "base/time/time.h"
#include "content/public/test/test_file_system_context.h"
#include "net/base/io_buffer.h"
+#include "net/base/request_priority.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
@@ -237,8 +238,8 @@ class BlobURLRequestJobTest : public testing::Test {
void TestRequest(const std::string& method,
const net::HttpRequestHeaders& extra_headers) {
- request_.reset(url_request_context_.CreateRequest(
- GURL("blob:blah"), &url_request_delegate_));
+ request_ = url_request_context_.CreateRequest(
+ GURL("blob:blah"), net::DEFAULT_PRIORITY, &url_request_delegate_);
request_->set_method(method);
if (!extra_headers.IsEmpty())
request_->SetExtraRequestHeaders(extra_headers);
diff --git a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc
index 79eb9f5..874e61b 100644
--- a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -18,6 +18,7 @@
#include "content/public/test/test_file_system_context.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
+#include "net/base/request_priority.h"
#include "net/http/http_request_headers.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -82,7 +83,8 @@ class FileSystemDirURLRequestJobTest : public testing::Test {
FileSystemContext* file_system_context) {
delegate_.reset(new net::TestDelegate());
delegate_->set_quit_on_redirect(true);
- request_.reset(empty_context_.CreateRequest(url, delegate_.get()));
+ request_ = empty_context_.CreateRequest(
+ url, net::DEFAULT_PRIORITY, delegate_.get());
job_ = new FileSystemDirURLRequestJob(
request_.get(), NULL, file_system_context);
diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc
index 3df243f..f414332 100644
--- a/content/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -25,6 +25,7 @@
#include "net/base/mime_util.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
+#include "net/base/request_priority.h"
#include "net/http/http_request_headers.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -97,7 +98,8 @@ class FileSystemURLRequestJobTest : public testing::Test {
// Make delegate_ exit the MessageLoop when the request is done.
delegate_->set_quit_on_complete(true);
delegate_->set_quit_on_redirect(true);
- request_.reset(empty_context_.CreateRequest(url, delegate_.get()));
+ request_ = empty_context_.CreateRequest(
+ url, net::DEFAULT_PRIORITY, delegate_.get());
if (headers)
request_->SetExtraRequestHeaders(*headers);
ASSERT_TRUE(!job_);
diff --git a/content/browser/fileapi/file_writer_delegate_unittest.cc b/content/browser/fileapi/file_writer_delegate_unittest.cc
index db0dba6..c18877f 100644
--- a/content/browser/fileapi/file_writer_delegate_unittest.cc
+++ b/content/browser/fileapi/file_writer_delegate_unittest.cc
@@ -13,6 +13,7 @@
#include "base/run_loop.h"
#include "content/public/test/test_file_system_context.h"
#include "net/base/io_buffer.h"
+#include "net/base/request_priority.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job.h"
@@ -129,8 +130,8 @@ class FileWriterDelegateTest : public PlatformTest {
int64 allowed_growth) {
file_writer_delegate_.reset(
CreateWriterDelegate(test_file_path, offset, allowed_growth));
- request_.reset(empty_context_.CreateRequest(
- blob_url, file_writer_delegate_.get()));
+ request_ = empty_context_.CreateRequest(
+ blob_url, net::DEFAULT_PRIORITY, file_writer_delegate_.get());
}
static net::URLRequest::ProtocolFactory Factory;
@@ -326,8 +327,8 @@ TEST_F(FileWriterDelegateTest, WriteSuccessWithoutQuotaLimitConcurrent) {
// Credate another FileWriterDelegate for concurrent write.
file_writer_delegate2.reset(CreateWriterDelegate("test2", 0, kint64max));
- request2.reset(empty_context_.CreateRequest(
- kBlobURL2, file_writer_delegate2.get()));
+ request2 = empty_context_.CreateRequest(
+ kBlobURL2, net::DEFAULT_PRIORITY, file_writer_delegate2.get());
Result result, result2;
ASSERT_EQ(0, usage());
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 657b385..1e66263 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1040,7 +1040,8 @@ void ResourceDispatcherHostImpl::BeginRequest(
// Construct the request.
scoped_ptr<net::URLRequest> new_request;
net::URLRequest* request;
- new_request.reset(request_context->CreateRequest(request_data.url, NULL));
+ new_request = request_context->CreateRequest(
+ request_data.url, request_data.priority, NULL);
request = new_request.get();
request->set_method(request_data.method);
@@ -1052,7 +1053,6 @@ void ResourceDispatcherHostImpl::BeginRequest(
request->SetExtraRequestHeaders(headers);
request->set_load_flags(load_flags);
- request->SetPriority(request_data.priority);
// Resolve elements from request_body and prepare upload data.
if (request_data.request_body.get()) {
@@ -1293,7 +1293,7 @@ void ResourceDispatcherHostImpl::BeginSaveFile(
}
scoped_ptr<net::URLRequest> request(
- request_context->CreateRequest(url, NULL));
+ request_context->CreateRequest(url, net::DEFAULT_PRIORITY, NULL));
request->set_method("GET");
SetReferrerForRequest(request.get(), referrer);
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 4939b80..900b5d1 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -32,6 +32,7 @@
#include "content/public/test/test_browser_context.h"
#include "content/test/test_content_browser_client.h"
#include "net/base/net_errors.h"
+#include "net/base/request_priority.h"
#include "net/base/upload_bytes_element_reader.h"
#include "net/base/upload_data_stream.h"
#include "net/http/http_util.h"
@@ -1514,7 +1515,8 @@ 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"), NULL, &context);
+ net::URLRequest req(
+ GURL("http://www.google.com"), net::DEFAULT_PRIORITY, NULL, &context);
EXPECT_EQ(4427,
ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(&req));
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index d228300..194930e 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -11,6 +11,7 @@
#include "content/public/test/mock_resource_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/test/test_content_browser_client.h"
+#include "net/base/request_priority.h"
#include "net/cert/x509_certificate.h"
#include "net/ssl/client_cert_store.h"
#include "net/ssl/ssl_cert_request_info.h"
@@ -211,9 +212,11 @@ TEST_F(ResourceLoaderTest, ClientCertStoreLookup) {
const int kRenderProcessId = 1;
const int kRenderViewId = 2;
- scoped_ptr<net::URLRequest> request(new net::URLRequest(
- GURL("dummy"), NULL,
- resource_context_.GetRequestContext()));
+ scoped_ptr<net::URLRequest> request(
+ new net::URLRequest(GURL("dummy"),
+ net::DEFAULT_PRIORITY,
+ NULL,
+ resource_context_.GetRequestContext()));
ResourceRequestInfo::AllocateForTesting(request.get(),
ResourceType::MAIN_FRAME,
&resource_context_,
@@ -274,8 +277,11 @@ TEST_F(ResourceLoaderTest, ClientCertStoreNull) {
const int kRenderProcessId = 1;
const int kRenderViewId = 2;
- scoped_ptr<net::URLRequest> request(new net::URLRequest(
- GURL("dummy"), NULL, resource_context_.GetRequestContext()));
+ scoped_ptr<net::URLRequest> request(
+ new net::URLRequest(GURL("dummy"),
+ net::DEFAULT_PRIORITY,
+ NULL,
+ resource_context_.GetRequestContext()));
ResourceRequestInfo::AllocateForTesting(request.get(),
ResourceType::MAIN_FRAME,
&resource_context_,
diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
index adcb74e..dade9ff 100644
--- a/content/browser/loader/resource_scheduler_unittest.cc
+++ b/content/browser/loader/resource_scheduler_unittest.cc
@@ -17,6 +17,7 @@
#include "content/public/browser/resource_throttle.h"
#include "content/public/common/process_type.h"
#include "net/base/host_port_pair.h"
+#include "net/base/request_priority.h"
#include "net/http/http_server_properties_impl.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h"
@@ -139,8 +140,7 @@ class ResourceSchedulerTest : public testing::Test {
net::RequestPriority priority,
int route_id) {
scoped_ptr<net::URLRequest> url_request(
- context_.CreateRequest(GURL(url), NULL));
- url_request->SetPriority(priority);
+ context_.CreateRequest(GURL(url), priority, NULL));
ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl(
PROCESS_TYPE_RENDERER, // process_type
kChildId, // child_id
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 7fd1870..f926ff6 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -834,7 +834,8 @@ void RenderMessageFilter::OnDownloadUrl(const IPC::Message& message,
scoped_ptr<DownloadSaveInfo> save_info(new DownloadSaveInfo());
save_info->suggested_name = suggested_name;
scoped_ptr<net::URLRequest> request(
- resource_context_->GetRequestContext()->CreateRequest(url, NULL));
+ resource_context_->GetRequestContext()->CreateRequest(
+ url, net::DEFAULT_PRIORITY, NULL));
RecordDownloadSource(INITIATED_BY_RENDERER);
resource_dispatcher_host_->BeginDownload(
request.Pass(),
diff --git a/content/browser/streams/stream_url_request_job_unittest.cc b/content/browser/streams/stream_url_request_job_unittest.cc
index 8914fe5..464f916 100644
--- a/content/browser/streams/stream_url_request_job_unittest.cc
+++ b/content/browser/streams/stream_url_request_job_unittest.cc
@@ -8,6 +8,7 @@
#include "content/browser/streams/stream_registry.h"
#include "content/browser/streams/stream_url_request_job.h"
#include "content/browser/streams/stream_write_observer.h"
+#include "net/base/request_priority.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -73,7 +74,8 @@ class StreamURLRequestJobTest : public testing::Test {
int expected_status_code,
const std::string& expected_response) {
net::TestDelegate delegate;
- request_.reset(url_request_context_.CreateRequest(url, &delegate));
+ request_ = url_request_context_.CreateRequest(
+ url, net::DEFAULT_PRIORITY, &delegate);
request_->set_method(method);
if (!extra_headers.IsEmpty())
request_->SetExtraRequestHeaders(extra_headers);
@@ -130,7 +132,8 @@ TEST_F(StreamURLRequestJobTest, TestGetLargeStreamRequest) {
TEST_F(StreamURLRequestJobTest, TestGetNonExistentStreamRequest) {
net::TestDelegate delegate;
- request_.reset(url_request_context_.CreateRequest(kStreamURL, &delegate));
+ request_ = url_request_context_.CreateRequest(
+ kStreamURL, net::DEFAULT_PRIORITY, &delegate);
request_->set_method("GET");
request_->Start();
generated by cgit v1.1 at 2025-02-10 23:48:16 +0000