diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/net/spdy/spdy_http_utils_unittest.cc | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/spdy/spdy_http_utils_unittest.cc')
-rw-r--r-- | chromium/net/spdy/spdy_http_utils_unittest.cc | 58 |
1 files changed, 5 insertions, 53 deletions
diff --git a/chromium/net/spdy/spdy_http_utils_unittest.cc b/chromium/net/spdy/spdy_http_utils_unittest.cc index 7a94ecabd52..a53e33145d2 100644 --- a/chromium/net/spdy/spdy_http_utils_unittest.cc +++ b/chromium/net/spdy/spdy_http_utils_unittest.cc @@ -4,7 +4,10 @@ #include "net/spdy/spdy_http_utils.h" -#include "base/basictypes.h" +#include <stdint.h> + +#include <limits> + #include "net/http/http_request_info.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_test_utils.h" @@ -34,28 +37,11 @@ TEST(SpdyHttpUtilsTest, ConvertSpdy3PriorityToRequestPriority) { EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4, SPDY3)); // These are invalid values, but we should still handle them // gracefully. - for (int i = 5; i < kuint8max; ++i) { + for (int i = 5; i < std::numeric_limits<uint8_t>::max(); ++i) { EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, SPDY3)); } } -TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY2) { - GURL url("https://www.google.com/index.html"); - HttpRequestInfo request; - request.method = "GET"; - request.url = url; - request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); - SpdyHeaderBlock headers; - CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2, - kDirect, &headers); - EXPECT_EQ("GET", headers["method"]); - EXPECT_EQ("https", headers["scheme"]); - EXPECT_EQ("www.google.com", headers["host"]); - EXPECT_EQ("/index.html", headers["url"]); - EXPECT_EQ("HTTP/1.1", headers["version"]); - EXPECT_EQ("Chrome/1.1", headers["user-agent"]); -} - TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY3) { GURL url("https://www.google.com/index.html"); HttpRequestInfo request; @@ -90,23 +76,6 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestHTTP2) { EXPECT_EQ("Chrome/1.1", headers["user-agent"]); } -TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY2) { - GURL url("https://www.google.com/index.html"); - HttpRequestInfo request; - request.method = "GET"; - request.url = url; - request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); - SpdyHeaderBlock headers; - CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2, - !kDirect, &headers); - EXPECT_EQ("GET", headers["method"]); - EXPECT_EQ("https", headers["scheme"]); - EXPECT_EQ("www.google.com", headers["host"]); - EXPECT_EQ("https://www.google.com/index.html", headers["url"]); - EXPECT_EQ("HTTP/1.1", headers["version"]); - EXPECT_EQ("Chrome/1.1", headers["user-agent"]); -} - TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY3) { GURL url("https://www.google.com/index.html"); HttpRequestInfo request; @@ -141,23 +110,6 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxyHTTP2) { EXPECT_EQ("Chrome/1.1", headers["user-agent"]); } -TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY2) { - GURL url("https://www.google.com/index.html"); - HttpRequestInfo request; - request.method = "CONNECT"; - request.url = url; - request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); - SpdyHeaderBlock headers; - CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2, - kDirect, &headers); - EXPECT_EQ("CONNECT", headers["method"]); - EXPECT_TRUE(headers.end() == headers.find("scheme")); - EXPECT_EQ("www.google.com", headers["host"]); - EXPECT_EQ("www.google.com:443", headers["url"]); - EXPECT_EQ("HTTP/1.1", headers["version"]); - EXPECT_EQ("Chrome/1.1", headers["user-agent"]); -} - TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY3) { GURL url("https://www.google.com/index.html"); HttpRequestInfo request; |