summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_layer_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 21:01:36 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 21:01:36 +0000
commit262eec8f3436504b5d6c9ea60fd2b9314b3cd495 (patch)
tree108e937f5e46b6828d62ca89c29446919002b1f6 /net/http/http_network_layer_unittest.cc
parent821572b27b959ab6fa5457cb41562dd7f2c48ab2 (diff)
downloadchromium_src-262eec8f3436504b5d6c9ea60fd2b9314b3cd495.zip
chromium_src-262eec8f3436504b5d6c9ea60fd2b9314b3cd495.tar.gz
chromium_src-262eec8f3436504b5d6c9ea60fd2b9314b3cd495.tar.bz2
[Net] Separate out priority field from HttpRequestInfo
This is in preparation for supporting reprioritization; HttpRequestInfo is assumed to be an unchanging struct, so priority can't live in it if it is something that can change. Also add DEFAULT_PRIORITY value and replace some uses of LOWEST with it. BUG=166689 Review URL: https://codereview.chromium.org/12833008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_layer_unittest.cc')
-rw-r--r--net/http/http_network_layer_unittest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
index c439f89..ac052de 100644
--- a/net/http/http_network_layer_unittest.cc
+++ b/net/http/http_network_layer_unittest.cc
@@ -55,28 +55,28 @@ class HttpNetworkLayerTest : public PlatformTest {
TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
scoped_ptr<HttpTransaction> trans;
- int rv = factory_->CreateTransaction(&trans, NULL);
+ int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
EXPECT_TRUE(trans.get() != NULL);
}
TEST_F(HttpNetworkLayerTest, Suspend) {
scoped_ptr<HttpTransaction> trans;
- int rv = factory_->CreateTransaction(&trans, NULL);
+ int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
trans.reset();
factory_->OnSuspend();
- rv = factory_->CreateTransaction(&trans, NULL);
+ rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(ERR_NETWORK_IO_SUSPENDED, rv);
ASSERT_TRUE(trans == NULL);
factory_->OnResume();
- rv = factory_->CreateTransaction(&trans, NULL);
+ rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
}
@@ -106,7 +106,7 @@ TEST_F(HttpNetworkLayerTest, GET) {
request_info.load_flags = LOAD_NORMAL;
scoped_ptr<HttpTransaction> trans;
- int rv = factory_->CreateTransaction(&trans, NULL);
+ int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
rv = trans->Start(&request_info, callback.callback(), BoundNetLog());
@@ -169,7 +169,7 @@ TEST_F(HttpNetworkLayerTest, ServerFallback) {
request_info.load_flags = LOAD_NORMAL;
scoped_ptr<HttpTransaction> trans;
- int rv = factory_->CreateTransaction(&trans, NULL);
+ int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
rv = trans->Start(&request_info, callback.callback(), BoundNetLog());
@@ -224,7 +224,7 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackDoesntLoop) {
request_info.load_flags = LOAD_NORMAL;
scoped_ptr<HttpTransaction> trans;
- int rv = factory_->CreateTransaction(&trans, NULL);
+ int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
rv = trans->Start(&request_info, callback.callback(), BoundNetLog());
@@ -272,7 +272,7 @@ TEST_F(HttpNetworkLayerTest, ProxyBypassIgnoredOnDirectConnection) {
request_info.load_flags = LOAD_NORMAL;
scoped_ptr<HttpTransaction> trans;
- int rv = factory_->CreateTransaction(&trans, NULL);
+ int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans, NULL);
EXPECT_EQ(OK, rv);
rv = trans->Start(&request_info, callback.callback(), BoundNetLog());