Revert of HttpCache::Transaction layer allowing parallel validation (patchset #33 id:800001 of https://codereview.chromium.org/2721933002/ )
Reason for revert:
Breaks tricky-tot-chrome-pfq-informational audio_CrasSanity autotest: https://uberchromegw.corp.google.com/i/chromeos.chrome/builders/tricky-tot-chrome-pfq-informational/builds/4271
Original issue's description:
> This CL is a precursor to allowing shared writing to fix cache lock.
>
> This CL allows transactions to continue to their validation phase even when another
> transaction is the active reader/writer. After the validation phase, if its a match
> the transaction might wait till the response is written to the cache by the active
> writer. If its not a match the transaction will doom the entry and go to the
> network. In a subsequent CL, the not matching case will create a new entry as well.
>
> BUG=472740
>
> Review-Url: https://codereview.chromium.org/2721933002
> Cr-Commit-Position: refs/heads/master@{#467426}
> Committed: https://chromium.googlesource.com/chromium/src/+/1e2e347f957ef889aaee527bb757849f76e8a808
[email protected],[email protected],[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=472740
Review-Url: https://codereview.chromium.org/2847653002
Cr-Commit-Position: refs/heads/master@{#467556}
diff --git a/net/url_request/url_request_quic_unittest.cc b/net/url_request/url_request_quic_unittest.cc
index 8c3f560..ff887060 100644
--- a/net/url_request/url_request_quic_unittest.cc
+++ b/net/url_request/url_request_quic_unittest.cc
@@ -305,14 +305,15 @@
EXPECT_TRUE(entries[0].GetStringValue("push_url", &value));
EXPECT_EQ(value, push_url_1);
- EXPECT_TRUE(entries[1].GetStringValue("push_url", &value));
+ // No net error code for this lookup transaction, the push is found.
+ EXPECT_FALSE(entries[1].GetIntegerValue("net_error", &net_error));
+
+ EXPECT_TRUE(entries[2].GetStringValue("push_url", &value));
EXPECT_EQ(value, push_url_2);
// Net error code -400 is found for this lookup transaction, the push is not
// found in the cache.
- EXPECT_TRUE(entries[2].GetIntegerValue("net_error", &net_error));
+ EXPECT_TRUE(entries[3].GetIntegerValue("net_error", &net_error));
EXPECT_EQ(net_error, -400);
- // No net error code for this lookup transaction, the push is found.
- EXPECT_FALSE(entries[3].GetIntegerValue("net_error", &net_error));
// Verify the reset error count received on the server side.
EXPECT_LE(1u, GetRstErrorCountReceivedByServer(QUIC_STREAM_CANCELLED));
@@ -391,13 +392,11 @@
EXPECT_TRUE(entries[0].GetStringValue("push_url", &value));
EXPECT_EQ(value, push_url_1);
-
- EXPECT_TRUE(entries[1].GetStringValue("push_url", &value));
- EXPECT_EQ(value, push_url_2);
-
// No net error code for this lookup transaction, the push is found.
- EXPECT_FALSE(entries[2].GetIntegerValue("net_error", &net_error));
+ EXPECT_FALSE(entries[1].GetIntegerValue("net_error", &net_error));
+ EXPECT_TRUE(entries[2].GetStringValue("push_url", &value));
+ EXPECT_EQ(value, push_url_2);
// No net error code for this lookup transaction, the push is found.
EXPECT_FALSE(entries[3].GetIntegerValue("net_error", &net_error));
