Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: media/blink/resource_multibuffer_data_provider_unittest.cc

Issue 2338963002: Store, use and send etags. (Closed)
Patch Set: comments addressed Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/blink/resource_multibuffer_data_provider_unittest.cc
diff --git a/media/blink/resource_multibuffer_data_provider_unittest.cc b/media/blink/resource_multibuffer_data_provider_unittest.cc
index b71f1f98bcd75274eb4a8a503aebdcb98992f57a..518fc5e861fa8e6a951e6301df3630fa8c3dfebf 100644
--- a/media/blink/resource_multibuffer_data_provider_unittest.cc
+++ b/media/blink/resource_multibuffer_data_provider_unittest.cc
@@ -46,6 +46,7 @@ namespace media {
const char kHttpUrl[] = "http://test";
const char kHttpRedirect[] = "http://test/ing";
+const char kEtag[] = "\"arglebargle glopy-glyf?\"";
const int kDataSize = 1024;
const int kHttpOK = 200;
@@ -54,7 +55,11 @@ const int kHttpPartialContent = 206;
enum NetworkState { NONE, LOADED, LOADING };
// Predicate that tests that request disallows compressed data.
-static bool CorrectAcceptEncoding(const blink::WebURLRequest& request) {
+static bool CorrectAcceptEncodingAndEtag(const blink::WebURLRequest& request) {
+ std::string etag =
+ request.httpHeaderField(WebString::fromUTF8("If-Match")).utf8();
+ EXPECT_EQ(etag, kEtag);
+
std::string value =
request.httpHeaderField(
WebString::fromUTF8(net::HttpRequestHeaders::kAcceptEncoding))
@@ -85,6 +90,7 @@ class ResourceMultiBufferDataProviderTest : public testing::Test {
void Initialize(const char* url, int first_position) {
gurl_ = GURL(url);
url_data_ = url_index_->GetByUrl(gurl_, UrlData::CORS_UNSPECIFIED);
+ url_data_->set_etag(kEtag);
DCHECK(url_data_);
DCHECK(url_data_->frame());
url_data_->OnRedirect(
@@ -105,8 +111,9 @@ class ResourceMultiBufferDataProviderTest : public testing::Test {
void Start() {
InSequence s;
- EXPECT_CALL(*url_loader_,
- loadAsynchronously(Truly(CorrectAcceptEncoding), loader_));
+ EXPECT_CALL(
+ *url_loader_,
+ loadAsynchronously(Truly(CorrectAcceptEncodingAndEtag), loader_));
loader_->Start();
}

Powered by Google App Engine
This is Rietveld 408576698