Support for new data reduction proxy via header

net/http/http_network_layer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_network_layer.h"
 
 #include "base/basictypes.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/net_log.h"
 #include "net/cert/mock_cert_verifier.h"
@@ skipping 605 matching lines @@
   // Verify that a Chrome-Proxy: bypass=<seconds> header induces proxy
   // fallback to a second proxy, if configured.
   std::string bad_proxy = GetChromeProxy();
   ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
       "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"),
+             "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);
   EXPECT_EQ(base::TimeDelta::FromSeconds(86400),
             (*proxy_service_->proxy_retry_info().begin()).second.current_delay);
 }
 
@@ skipping 37 matching lines @@
 TEST_F(HttpNetworkLayerTest, NoServerFallbackWithChainedViaHeader) {
   // Verify that Chrome will not be induced to bypass the Chrome proxy when
   // the Chrome Proxy via header is present, even if that header is chained.
   std::string chrome_proxy = GetChromeProxy();
   ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
       "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"),
+             "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", std::string(), false, 0);
+}
+
+TEST_F(HttpNetworkLayerTest, NoServerFallbackWithDeprecatedViaHeader) {
+  // Verify that Chrome will not be induced to bypass the Chrome proxy when
+  // the Chrome Proxy via header is present, even if that header is chained.
+  std::string chrome_proxy = GetChromeProxy();
+  ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
+      "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),
+  };
 
   TestProxyFallbackByMethodWithMockReads(chrome_proxy, std::string(),
                                          data_reads, arraysize(data_reads),
                                          "GET", std::string(), false, 0);
 }
 
 #if defined(DATA_REDUCTION_FALLBACK_HOST)
 TEST_F(HttpNetworkLayerTest, ServerFallbackWithProxyTimedBypassAll) {
   // Verify that a Chrome-Proxy: block=<seconds> header bypasses a
   // a configured Chrome-Proxy and fallback and induces proxy fallback to a
   // third proxy, if configured.
   std::string bad_proxy = GetChromeProxy();
   std::string fallback_proxy = GetChromeFallbackProxy();
   ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
       "PROXY " + bad_proxy + "; PROXY " + fallback_proxy +
       "; 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"),
+             "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);
   EXPECT_EQ(base::TimeDelta::FromSeconds(86400),
             (*proxy_service_->proxy_retry_info().begin()).second.current_delay);
 }
 #endif  // defined(DATA_REDUCTION_FALLBACK_HOST)
@@ skipping 65 matching lines @@
   ASSERT_EQ(ERR_CONNECTION_RESET, callback.GetResult(rv));
 
   // If the response info is null, that means that any consumer won't
   // see the network accessed bit set.
   EXPECT_EQ(NULL, trans->GetResponseInfo());
 }
 
 }  // namespace
 
 }  // namespace net