diff options
author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 21:23:42 +0000 |
---|---|---|
committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 21:23:42 +0000 |
commit | a0a0693ef2884bc152e27f9a2a26821b25ab599e (patch) | |
tree | e97ed75c491235b50da926b7ac5660868167e6a1 /net/http/http_response_headers_unittest.cc | |
parent | 596ca12542dea0f2db4c42afe28d52e515dfe578 (diff) | |
download | chromium_src-a0a0693ef2884bc152e27f9a2a26821b25ab599e.zip chromium_src-a0a0693ef2884bc152e27f9a2a26821b25ab599e.tar.gz chromium_src-a0a0693ef2884bc152e27f9a2a26821b25ab599e.tar.bz2 |
Moved data reduction proxy chrome code to component
Platform-inspecific code was moved from
chrome/browser/net/spdyproxy to components/data_reduction_proxy.
Names that include variations on SpdyProxyAuth have been changed to
DataReductionProxy.
Significant changes include: (1) InitChromeProxySettings now
takes |PrefService|s and a URLRequestContextGetter. (2)
All switches and prefs have been moved to
components/data_reduction_proxy/common.
(3) data_reduction_proxy_settings_unittest.[cc,h] was split into
itself and data_reduction_proxy_settings_test_util.[cc,h]. (4) proxy
configuration via prefs is embedded.
BUG=359340
Review URL: https://codereview.chromium.org/214343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_response_headers_unittest.cc')
-rw-r--r-- | net/http/http_response_headers_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/http/http_response_headers_unittest.cc b/net/http/http_response_headers_unittest.cc index f73e176..361b5ee 100644 --- a/net/http/http_response_headers_unittest.cc +++ b/net/http/http_response_headers_unittest.cc @@ -2093,17 +2093,17 @@ TEST(HttpResponseHeadersTest, GetProxyBypassInfo) { scoped_refptr<net::HttpResponseHeaders> parsed( new net::HttpResponseHeaders(headers)); - net::HttpResponseHeaders::ChromeProxyInfo chrome_proxy_info; + net::HttpResponseHeaders::DataReductionProxyInfo data_reduction_proxy_info; EXPECT_EQ(tests[i].expected_result, - parsed->GetChromeProxyInfo(&chrome_proxy_info)); + parsed->GetDataReductionProxyInfo(&data_reduction_proxy_info)); EXPECT_EQ(tests[i].expected_retry_delay, - chrome_proxy_info.bypass_duration.InSeconds()); + data_reduction_proxy_info.bypass_duration.InSeconds()); EXPECT_EQ(tests[i].expected_bypass_all, - chrome_proxy_info.bypass_all); + data_reduction_proxy_info.bypass_all); } } -TEST(HttpResponseHeadersTest, IsChromeProxyResponse) { +TEST(HttpResponseHeadersTest, IsDataReductionProxyResponse) { const struct { const char* headers; bool expected_result; @@ -2173,11 +2173,11 @@ TEST(HttpResponseHeadersTest, IsChromeProxyResponse) { scoped_refptr<net::HttpResponseHeaders> parsed( new net::HttpResponseHeaders(headers)); - EXPECT_EQ(tests[i].expected_result, parsed->IsChromeProxyResponse()); + EXPECT_EQ(tests[i].expected_result, parsed->IsDataReductionProxyResponse()); } } -TEST(HttpResponseHeadersTest, GetChromeProxyBypassEventType) { +TEST(HttpResponseHeadersTest, GetDataReductionProxyBypassEventType) { const struct { const char* headers; net::ProxyService::DataReductionProxyBypassEventType expected_result; @@ -2244,9 +2244,9 @@ TEST(HttpResponseHeadersTest, GetChromeProxyBypassEventType) { HeadersToRaw(&headers); scoped_refptr<net::HttpResponseHeaders> parsed( new net::HttpResponseHeaders(headers)); - net::HttpResponseHeaders::ChromeProxyInfo chrome_proxy_info; + net::HttpResponseHeaders::DataReductionProxyInfo chrome_proxy_info; EXPECT_EQ(tests[i].expected_result, - parsed->GetChromeProxyBypassEventType(&chrome_proxy_info)); + parsed->GetDataReductionProxyBypassEventType(&chrome_proxy_info)); } } #endif // defined(SPDY_PROXY_AUTH_ORIGIN) |