diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 22:05:19 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 22:05:19 +0000 |
| commit | 2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1 (patch) | |
| tree | 65eae8674a5f174856f79a2d14758b271aa33843 /content/browser/loader/resource_loader_unittest.cc | |
| parent | 93b7afd44a79bfdc4ce282cd6a848671b14762f9 (diff) | |
| download | chromium_src-2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1.zip chromium_src-2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1.tar.gz chromium_src-2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1.tar.bz2 | |
[Net] Add a priority parameter to URLRequest's constructor
This is so that it is clearer what the intended initial priority of
a URLRequest is.
It is also needed so that we can later enforce that if a URLRequest
is set to ignore limits, it has MAXIMUM_PRIORITY; otherwise, we'd have
to mandate that SetPriority() is called before set_load_flags(), which
is fiddly.
Also standardize on a single URLRequest constructor.
BUG=166689
R=jam@chromium.org, jamesr@chromium.org, joth@chromium.org, mmenke@chromium.org, scottbyer@chromium.org, sky@chromium.org, tommi@chromium.org
Review URL: https://codereview.chromium.org/51953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_loader_unittest.cc')
| -rw-r--r-- | content/browser/loader/resource_loader_unittest.cc | 16 |
1 files changed, 11 insertions, 5 deletions
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_, |