| Index: net/http/http_network_layer_unittest.cc
|
| diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
|
| index 5e12895878c7c876b8243d9d5df4ac5d6953c41e..c3250676965f83b555d33b8f9d2293e307edfb8f 100644
|
| --- a/net/http/http_network_layer_unittest.cc
|
| +++ b/net/http/http_network_layer_unittest.cc
|
| @@ -88,14 +88,15 @@ class HttpNetworkLayerTest : public PlatformTest {
|
|
|
| if (!header.empty()) {
|
| // We also have a server header here that isn't set by the proxy.
|
| - EXPECT_TRUE(trans->GetResponseInfo()->headers->HasHeaderValue(
|
| - header, value));
|
| + EXPECT_TRUE(
|
| + trans->GetResponseInfo()->headers->HasHeaderValue(header, value));
|
| }
|
| }
|
|
|
| // Check that |proxy_count| proxies are in the retry list.
|
| // These will be, in order, |bad_proxy| and |bad_proxy2|".
|
| - void TestBadProxies(unsigned int proxy_count, const std::string& bad_proxy,
|
| + void TestBadProxies(unsigned int proxy_count,
|
| + const std::string& bad_proxy,
|
| const std::string& bad_proxy2) {
|
| const ProxyRetryInfoMap& retry_info = proxy_service_->proxy_retry_info();
|
| ASSERT_EQ(proxy_count, retry_info.size());
|
| @@ -111,13 +112,13 @@ class HttpNetworkLayerTest : public PlatformTest {
|
| // received, and the first proxy |bad_proxy| was marked as bad.
|
| void TestProxyFallback(const std::string& bad_proxy) {
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| - TestProxyFallbackWithMockReads(bad_proxy, "", data_reads,
|
| - arraysize(data_reads), 1u);
|
| + TestProxyFallbackWithMockReads(
|
| + bad_proxy, "", data_reads, arraysize(data_reads), 1u);
|
| }
|
|
|
| void TestProxyFallbackWithMockReads(const std::string& bad_proxy,
|
| @@ -125,9 +126,14 @@ class HttpNetworkLayerTest : public PlatformTest {
|
| MockRead data_reads[],
|
| int data_reads_size,
|
| unsigned int expected_retry_info_size) {
|
| - TestProxyFallbackByMethodWithMockReads(bad_proxy, bad_proxy2, data_reads,
|
| - data_reads_size, "GET", "content",
|
| - true, expected_retry_info_size);
|
| + TestProxyFallbackByMethodWithMockReads(bad_proxy,
|
| + bad_proxy2,
|
| + data_reads,
|
| + data_reads_size,
|
| + "GET",
|
| + "content",
|
| + true,
|
| + expected_retry_info_size);
|
| }
|
|
|
| void TestProxyFallbackByMethodWithMockReads(
|
| @@ -140,43 +146,47 @@ class HttpNetworkLayerTest : public PlatformTest {
|
| bool retry_expected,
|
| unsigned int expected_retry_info_size) {
|
| std::string trailer =
|
| - (method == "HEAD" || method == "PUT" || method == "POST") ?
|
| - "Content-Length: 0\r\n\r\n" : "\r\n";
|
| - std::string request =
|
| - base::StringPrintf("%s http://www.google.com/ HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Proxy-Connection: keep-alive\r\n"
|
| - "%s", method.c_str(), trailer.c_str());
|
| + (method == "HEAD" || method == "PUT" || method == "POST")
|
| + ? "Content-Length: 0\r\n\r\n"
|
| + : "\r\n";
|
| + std::string request = base::StringPrintf(
|
| + "%s http://www.google.com/ HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Proxy-Connection: keep-alive\r\n"
|
| + "%s",
|
| + method.c_str(),
|
| + trailer.c_str());
|
|
|
| MockWrite data_writes[] = {
|
| - MockWrite(request.c_str()),
|
| + MockWrite(request.c_str()),
|
| };
|
|
|
| - StaticSocketDataProvider data1(data_reads, data_reads_size,
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data1(
|
| + data_reads, data_reads_size, data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data1);
|
|
|
| // Second data provider returns the expected content.
|
| MockRead data_reads2[3];
|
| size_t data_reads2_index = 0;
|
| - data_reads2[data_reads2_index++] = MockRead("HTTP/1.0 200 OK\r\n"
|
| - "Server: not-proxy\r\n\r\n");
|
| + data_reads2[data_reads2_index++] = MockRead(
|
| + "HTTP/1.0 200 OK\r\n"
|
| + "Server: not-proxy\r\n\r\n");
|
| if (!content.empty())
|
| data_reads2[data_reads2_index++] = MockRead(content.c_str());
|
| data_reads2[data_reads2_index++] = MockRead(SYNCHRONOUS, OK);
|
|
|
| MockWrite data_writes2[] = {
|
| - MockWrite(request.c_str()),
|
| + MockWrite(request.c_str()),
|
| };
|
| - StaticSocketDataProvider data2(data_reads2, data_reads2_index,
|
| - data_writes2, arraysize(data_writes2));
|
| + StaticSocketDataProvider data2(
|
| + data_reads2, data_reads2_index, data_writes2, arraysize(data_writes2));
|
| mock_socket_factory_.AddSocketDataProvider(&data2);
|
|
|
| // Expect that we get "content" and not "Bypass message", and that there's
|
| // a "not-proxy" "Server:" header in the final response.
|
| if (retry_expected) {
|
| - ExecuteRequestExpectingContentAndHeader(method, content,
|
| - "server", "not-proxy");
|
| + ExecuteRequestExpectingContentAndHeader(
|
| + method, content, "server", "not-proxy");
|
| } else {
|
| ExecuteRequestExpectingContentAndHeader(method, content, "", "");
|
| }
|
| @@ -191,40 +201,44 @@ class HttpNetworkLayerTest : public PlatformTest {
|
| // received, and the proxy |bad_proxy| was marked as bad.
|
| void TestProxyFallbackToDirect(const std::string& bad_proxy) {
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Proxy-Connection: keep-alive\r\n\r\n"),
|
| + MockWrite(
|
| + "GET http://www.google.com/ HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Proxy-Connection: keep-alive\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data1(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data1);
|
|
|
| // Second data provider returns the expected content.
|
| MockRead data_reads2[] = {
|
| - MockRead("HTTP/1.0 200 OK\r\n"
|
| - "Server: not-proxy\r\n\r\n"),
|
| - MockRead("content"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.0 200 OK\r\n"
|
| + "Server: not-proxy\r\n\r\n"),
|
| + MockRead("content"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes2[] = {
|
| - MockWrite("GET / HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Connection: keep-alive\r\n\r\n"),
|
| + MockWrite(
|
| + "GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
|
| - data_writes2, arraysize(data_writes2));
|
| + StaticSocketDataProvider data2(data_reads2,
|
| + arraysize(data_reads2),
|
| + data_writes2,
|
| + arraysize(data_writes2));
|
| mock_socket_factory_.AddSocketDataProvider(&data2);
|
|
|
| // Expect that we get "content" and not "Bypass message", and that there's
|
| // a "not-proxy" "Server:" header in the final response.
|
| - ExecuteRequestExpectingContentAndHeader("GET", "content",
|
| - "server", "not-proxy");
|
| + ExecuteRequestExpectingContentAndHeader(
|
| + "GET", "content", "server", "not-proxy");
|
|
|
| // We should also observe the bad proxy in the retry list.
|
| TestBadProxies(1u, bad_proxy, "");
|
| @@ -239,20 +253,21 @@ class HttpNetworkLayerTest : public PlatformTest {
|
| const std::string& bad_proxy,
|
| const std::string& bad_proxy2) {
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Proxy-Connection: keep-alive\r\n\r\n"),
|
| + MockWrite(
|
| + "GET http://www.google.com/ HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Proxy-Connection: keep-alive\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| - StaticSocketDataProvider data2(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data1(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data2(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
|
|
| mock_socket_factory_.AddSocketDataProvider(&data1);
|
| if (proxy_count > 1)
|
| @@ -305,18 +320,18 @@ TEST_F(HttpNetworkLayerTest, Suspend) {
|
|
|
| TEST_F(HttpNetworkLayerTest, GET) {
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.0 200 OK\r\n\r\n"),
|
| - MockRead("hello world"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead("HTTP/1.0 200 OK\r\n\r\n"), MockRead("hello world"),
|
| + MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET / HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "User-Agent: Foo/1.0\r\n\r\n"),
|
| + MockWrite(
|
| + "GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "User-Agent: Foo/1.0\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data);
|
|
|
| TestCompletionCallback callback;
|
| @@ -364,7 +379,7 @@ TEST_F(HttpNetworkLayerTest, ServerTwoProxyBypassPac) {
|
| TEST_F(HttpNetworkLayerTest, ServerTwoProxyBypassFixed) {
|
| std::string bad_proxy = GetDataReductionProxy();
|
| ConfigureTestDependencies(
|
| - ProxyService::CreateFixed(bad_proxy +", good:8080"));
|
| + ProxyService::CreateFixed(bad_proxy + ", good:8080"));
|
| TestProxyFallback(bad_proxy);
|
| }
|
|
|
| @@ -375,57 +390,46 @@ TEST_F(HttpNetworkLayerTest, BypassAndRetryIdempotentMethods) {
|
| std::string content;
|
| bool expected_to_retry;
|
| } tests[] = {
|
| - {
|
| - "GET",
|
| - "content",
|
| - true,
|
| - },
|
| - {
|
| - "OPTIONS",
|
| - "content",
|
| - true,
|
| - },
|
| - {
|
| - "HEAD",
|
| - "",
|
| - true,
|
| - },
|
| - {
|
| - "PUT",
|
| - "",
|
| - true,
|
| - },
|
| - {
|
| - "DELETE",
|
| - "content",
|
| - true,
|
| - },
|
| - {
|
| - "TRACE",
|
| - "content",
|
| - true,
|
| - },
|
| - {
|
| - "POST",
|
| - "Bypass message",
|
| - false,
|
| - },
|
| - };
|
| + {
|
| + "GET", "content", true,
|
| + },
|
| + {
|
| + "OPTIONS", "content", true,
|
| + },
|
| + {
|
| + "HEAD", "", true,
|
| + },
|
| + {
|
| + "PUT", "", true,
|
| + },
|
| + {
|
| + "DELETE", "content", true,
|
| + },
|
| + {
|
| + "TRACE", "content", true,
|
| + },
|
| + {
|
| + "POST", "Bypass message", false,
|
| + },
|
| + };
|
|
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
|
| ConfigureTestDependencies(
|
| - ProxyService::CreateFixed(bad_proxy +", good:8080"));
|
| + ProxyService::CreateFixed(bad_proxy + ", good:8080"));
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| - TestProxyFallbackByMethodWithMockReads(bad_proxy, "", data_reads,
|
| + TestProxyFallbackByMethodWithMockReads(bad_proxy,
|
| + "",
|
| + data_reads,
|
| arraysize(data_reads),
|
| tests[i].method,
|
| tests[i].content,
|
| - tests[i].expected_to_retry, 1u);
|
| + tests[i].expected_to_retry,
|
| + 1u);
|
| }
|
| }
|
|
|
| @@ -457,16 +461,16 @@ TEST_F(HttpNetworkLayerTest, ServerTwoProxyDoubleBypassFixed) {
|
| std::string bad_proxy = GetDataReductionProxy();
|
| std::string bad_proxy2 =
|
| HostPortPair::FromURL(GURL(DATA_REDUCTION_FALLBACK_HOST)).ToString();
|
| - ConfigureTestDependencies(ProxyService::CreateFixed(
|
| - bad_proxy + ", " + bad_proxy2));
|
| + ConfigureTestDependencies(
|
| + ProxyService::CreateFixed(bad_proxy + ", " + bad_proxy2));
|
| TestProxyFallbackFail(2u, bad_proxy, bad_proxy2);
|
| }
|
| #endif
|
|
|
| TEST_F(HttpNetworkLayerTest, ServerOneProxyNoDirectBypassPac) {
|
| std::string bad_proxy = GetDataReductionProxy();
|
| - ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
|
| - "PROXY " + bad_proxy));
|
| + ConfigureTestDependencies(
|
| + ProxyService::CreateFixedFromPacResult("PROXY " + bad_proxy));
|
| TestProxyFallbackFail(1u, bad_proxy, "");
|
| }
|
|
|
| @@ -486,50 +490,51 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackOn5xxError) {
|
| // the expected data via the second.
|
| std::string data_reduction_proxy(
|
| HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)).ToString());
|
| - std::string pac_string = base::StringPrintf(
|
| - "PROXY %s; PROXY good:8080", data_reduction_proxy.data());
|
| + std::string pac_string = base::StringPrintf("PROXY %s; PROXY good:8080",
|
| + data_reduction_proxy.data());
|
|
|
| - std::string headers[] = {
|
| - "HTTP/1.1 500 Internal Server Error\r\n\r\n",
|
| - "HTTP/1.1 502 Bad Gateway\r\n\r\n",
|
| - "HTTP/1.1 503 Service Unavailable\r\n\r\n"
|
| - };
|
| + std::string headers[] = {"HTTP/1.1 500 Internal Server Error\r\n\r\n",
|
| + "HTTP/1.1 502 Bad Gateway\r\n\r\n",
|
| + "HTTP/1.1 503 Service Unavailable\r\n\r\n"};
|
|
|
| for (size_t i = 0; i < arraysize(headers); ++i) {
|
| ConfigureTestDependencies(
|
| ProxyService::CreateFixedFromPacResult(pac_string));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead(headers[i].c_str()),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(headers[i].c_str()), MockRead("Bypass message"),
|
| + MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Proxy-Connection: keep-alive\r\n\r\n"),
|
| + MockWrite(
|
| + "GET http://www.google.com/ HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Proxy-Connection: keep-alive\r\n\r\n"),
|
| };
|
|
|
| - StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data1(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data1);
|
|
|
| // Second data provider returns the expected content.
|
| MockRead data_reads2[] = {
|
| - MockRead("HTTP/1.0 200 OK\r\n"
|
| - "Server: not-proxy\r\n\r\n"),
|
| - MockRead("content"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.0 200 OK\r\n"
|
| + "Server: not-proxy\r\n\r\n"),
|
| + MockRead("content"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes2[] = {
|
| - MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Proxy-Connection: keep-alive\r\n\r\n"),
|
| + MockWrite(
|
| + "GET http://www.google.com/ HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Proxy-Connection: keep-alive\r\n\r\n"),
|
| };
|
|
|
| - StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
|
| - data_writes2, arraysize(data_writes2));
|
| + StaticSocketDataProvider data2(data_reads2,
|
| + arraysize(data_reads2),
|
| + data_writes2,
|
| + arraysize(data_writes2));
|
| mock_socket_factory_.AddSocketDataProvider(&data2);
|
|
|
| TestCompletionCallback callback;
|
| @@ -556,8 +561,8 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackOn5xxError) {
|
| // corresponding to the fallback proxy.
|
| EXPECT_EQ("content", contents);
|
| // We also have a server header here that isn't set by the proxy.
|
| - EXPECT_TRUE(trans->GetResponseInfo()->headers->HasHeaderValue(
|
| - "server", "not-proxy"));
|
| + EXPECT_TRUE(trans->GetResponseInfo()->headers->HasHeaderValue("server",
|
| + "not-proxy"));
|
| // We should also observe the data reduction proxy in the retry list.
|
| ASSERT_EQ(1u, proxy_service_->proxy_retry_info().size());
|
| EXPECT_EQ(data_reduction_proxy,
|
| @@ -572,18 +577,19 @@ TEST_F(HttpNetworkLayerTest, ProxyBypassIgnoredOnDirectConnectionPac) {
|
| ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult("DIRECT"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Chrome-Proxy: bypass=0\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET / HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Connection: keep-alive\r\n\r\n"),
|
| + MockWrite(
|
| + "GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data1(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data1);
|
| TestCompletionCallback callback;
|
|
|
| @@ -620,16 +626,16 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackWithProxyTimedBypass) {
|
| "PROXY " + bad_proxy + "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "Chrome-Proxy: bypass=86400\r\n"
|
| - "Via: 1.1 Chrome-Compression-Proxy\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Chrome-Proxy: bypass=86400\r\n"
|
| + "Via: 1.1 Chrome-Compression-Proxy\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackWithMockReads(bad_proxy, "", data_reads,
|
| - arraysize(data_reads), 1u);
|
| + TestProxyFallbackWithMockReads(
|
| + bad_proxy, "", data_reads, arraysize(data_reads), 1u);
|
| EXPECT_EQ(base::TimeDelta::FromSeconds(86400),
|
| (*proxy_service_->proxy_retry_info().begin()).second.current_delay);
|
| }
|
| @@ -642,15 +648,15 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackWithWrongViaHeader) {
|
| "PROXY " + chrome_proxy + "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "Via: 1.0 some-other-proxy\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Via: 1.0 some-other-proxy\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackWithMockReads(chrome_proxy, std::string(), data_reads,
|
| - arraysize(data_reads), 1u);
|
| + TestProxyFallbackWithMockReads(
|
| + chrome_proxy, std::string(), data_reads, arraysize(data_reads), 1u);
|
| }
|
|
|
| TEST_F(HttpNetworkLayerTest, ServerFallbackWithNoViaHeader) {
|
| @@ -661,14 +667,14 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackWithNoViaHeader) {
|
| "PROXY " + chrome_proxy + "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Connection: keep-alive\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Connection: keep-alive\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackWithMockReads(chrome_proxy, std::string(), data_reads,
|
| - arraysize(data_reads), 1u);
|
| + TestProxyFallbackWithMockReads(
|
| + chrome_proxy, std::string(), data_reads, arraysize(data_reads), 1u);
|
| }
|
|
|
| TEST_F(HttpNetworkLayerTest, NoServerFallbackWith304Response) {
|
| @@ -679,14 +685,20 @@ TEST_F(HttpNetworkLayerTest, NoServerFallbackWith304Response) {
|
| "PROXY " + chrome_proxy + "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 304 Not Modified\r\n"
|
| - "Connection: keep-alive\r\n\r\n"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 304 Not Modified\r\n"
|
| + "Connection: keep-alive\r\n\r\n"),
|
| + MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackByMethodWithMockReads(chrome_proxy, std::string(),
|
| - data_reads, arraysize(data_reads),
|
| - "GET", std::string(), false, 0);
|
| + TestProxyFallbackByMethodWithMockReads(chrome_proxy,
|
| + std::string(),
|
| + data_reads,
|
| + arraysize(data_reads),
|
| + "GET",
|
| + std::string(),
|
| + false,
|
| + 0);
|
| }
|
|
|
| TEST_F(HttpNetworkLayerTest, NoServerFallbackWithChainedViaHeader) {
|
| @@ -698,16 +710,21 @@ TEST_F(HttpNetworkLayerTest, NoServerFallbackWithChainedViaHeader) {
|
| "PROXY " + chrome_proxy + "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "Via: 1.1 Chrome-Compression-Proxy, 1.0 some-other-proxy\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Via: 1.1 Chrome-Compression-Proxy, 1.0 some-other-proxy\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackByMethodWithMockReads(chrome_proxy, std::string(),
|
| - data_reads, arraysize(data_reads),
|
| - "GET", "Bypass message", false, 0);
|
| + TestProxyFallbackByMethodWithMockReads(chrome_proxy,
|
| + std::string(),
|
| + data_reads,
|
| + arraysize(data_reads),
|
| + "GET",
|
| + "Bypass message",
|
| + false,
|
| + 0);
|
| }
|
|
|
| TEST_F(HttpNetworkLayerTest, NoServerFallbackWithDeprecatedViaHeader) {
|
| @@ -719,16 +736,21 @@ TEST_F(HttpNetworkLayerTest, NoServerFallbackWithDeprecatedViaHeader) {
|
| "PROXY " + chrome_proxy + "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "Via: 1.1 Chrome Compression Proxy\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Via: 1.1 Chrome Compression Proxy\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackByMethodWithMockReads(chrome_proxy, std::string(),
|
| - data_reads, arraysize(data_reads),
|
| - "GET", "Bypass message", false, 0);
|
| + TestProxyFallbackByMethodWithMockReads(chrome_proxy,
|
| + std::string(),
|
| + data_reads,
|
| + arraysize(data_reads),
|
| + "GET",
|
| + "Bypass message",
|
| + false,
|
| + 0);
|
| }
|
|
|
| #if defined(DATA_REDUCTION_FALLBACK_HOST)
|
| @@ -743,16 +765,16 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackWithProxyTimedBypassAll) {
|
| "; PROXY good:8080"));
|
|
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.1 200 OK\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "Chrome-Proxy: block=86400\r\n"
|
| - "Via: 1.1 Chrome-Compression-Proxy\r\n\r\n"),
|
| - MockRead("Bypass message"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead(
|
| + "HTTP/1.1 200 OK\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Chrome-Proxy: block=86400\r\n"
|
| + "Via: 1.1 Chrome-Compression-Proxy\r\n\r\n"),
|
| + MockRead("Bypass message"), MockRead(SYNCHRONOUS, OK),
|
| };
|
|
|
| - TestProxyFallbackWithMockReads(bad_proxy, fallback_proxy, data_reads,
|
| - arraysize(data_reads), 2u);
|
| + TestProxyFallbackWithMockReads(
|
| + bad_proxy, fallback_proxy, data_reads, arraysize(data_reads), 2u);
|
| EXPECT_EQ(base::TimeDelta::FromSeconds(86400),
|
| (*proxy_service_->proxy_retry_info().begin()).second.current_delay);
|
| }
|
| @@ -761,18 +783,18 @@ TEST_F(HttpNetworkLayerTest, ServerFallbackWithProxyTimedBypassAll) {
|
|
|
| TEST_F(HttpNetworkLayerTest, NetworkVerified) {
|
| MockRead data_reads[] = {
|
| - MockRead("HTTP/1.0 200 OK\r\n\r\n"),
|
| - MockRead("hello world"),
|
| - MockRead(SYNCHRONOUS, OK),
|
| + MockRead("HTTP/1.0 200 OK\r\n\r\n"), MockRead("hello world"),
|
| + MockRead(SYNCHRONOUS, OK),
|
| };
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET / HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "User-Agent: Foo/1.0\r\n\r\n"),
|
| + MockWrite(
|
| + "GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "User-Agent: Foo/1.0\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data);
|
|
|
| TestCompletionCallback callback;
|
| @@ -796,16 +818,17 @@ TEST_F(HttpNetworkLayerTest, NetworkVerified) {
|
|
|
| TEST_F(HttpNetworkLayerTest, NetworkUnVerified) {
|
| MockRead data_reads[] = {
|
| - MockRead(ASYNC, ERR_CONNECTION_RESET),
|
| + MockRead(ASYNC, ERR_CONNECTION_RESET),
|
| };
|
| MockWrite data_writes[] = {
|
| - MockWrite("GET / HTTP/1.1\r\n"
|
| - "Host: www.google.com\r\n"
|
| - "Connection: keep-alive\r\n"
|
| - "User-Agent: Foo/1.0\r\n\r\n"),
|
| + MockWrite(
|
| + "GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "User-Agent: Foo/1.0\r\n\r\n"),
|
| };
|
| - StaticSocketDataProvider data(data_reads, arraysize(data_reads),
|
| - data_writes, arraysize(data_writes));
|
| + StaticSocketDataProvider data(
|
| + data_reads, arraysize(data_reads), data_writes, arraysize(data_writes));
|
| mock_socket_factory_.AddSocketDataProvider(&data);
|
|
|
| TestCompletionCallback callback;
|
|
|
Chromium Code Reviews
