summaryrefslogtreecommitdiffstats
path: root/net/test/spawned_test_server
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-31 22:05:19 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-31 22:05:19 +0000
commit2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1 (patch)
tree65eae8674a5f174856f79a2d14758b271aa33843 /net/test/spawned_test_server
parent93b7afd44a79bfdc4ce282cd6a848671b14762f9 (diff)
downloadchromium_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 'net/test/spawned_test_server')
-rw-r--r--net/test/spawned_test_server/spawner_communicator.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/test/spawned_test_server/spawner_communicator.cc b/net/test/spawned_test_server/spawner_communicator.cc
index f93ff97..3887157 100644
--- a/net/test/spawned_test_server/spawner_communicator.cc
+++ b/net/test/spawned_test_server/spawner_communicator.cc
@@ -13,6 +13,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "net/base/net_util.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_response_headers.h"
@@ -171,9 +172,9 @@ void SpawnerCommunicator::SendCommandAndWaitForResultOnIOThread(
// Prepare the URLRequest for sending the command.
DCHECK(!cur_request_.get());
context_.reset(new TestURLRequestContext);
- cur_request_.reset(context_->CreateRequest(
- GenerateSpawnerCommandURL(command, port_), this));
- DCHECK(cur_request_.get());
+ cur_request_ = context_->CreateRequest(
+ GenerateSpawnerCommandURL(command, port_), DEFAULT_PRIORITY, this);
+ DCHECK(cur_request_);
int current_request_id = ++next_id_;
SpawnerRequestData* data = new SpawnerRequestData(current_request_id,
result_code,