OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metr
ics.h" | 5 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metr
ics.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 test_context->RunUntilIdle(); | 181 test_context->RunUntilIdle(); |
182 | 182 |
183 // Mark the Data Reduction Proxy as bad if the test specifies to. | 183 // Mark the Data Reduction Proxy as bad if the test specifies to. |
184 if (test_case.bypass_duration > base::TimeDelta()) { | 184 if (test_case.bypass_duration > base::TimeDelta()) { |
185 net::ProxyInfo proxy_info; | 185 net::ProxyInfo proxy_info; |
186 proxy_info.UseProxyList( | 186 proxy_info.UseProxyList( |
187 data_reduction_proxy_config.proxy_rules().proxies_for_http); | 187 data_reduction_proxy_config.proxy_rules().proxies_for_http); |
188 EXPECT_TRUE(context.proxy_service()->MarkProxiesAsBadUntil( | 188 EXPECT_TRUE(context.proxy_service()->MarkProxiesAsBadUntil( |
189 proxy_info, test_case.bypass_duration, | 189 proxy_info, test_case.bypass_duration, |
190 std::vector<net::ProxyServer>(), | 190 std::vector<net::ProxyServer>(), |
191 net::BoundNetLog::Make(context.net_log(), | 191 net::NetLogWithSource::Make(context.net_log(), |
192 net::NetLogSourceType::NONE))); | 192 net::NetLogSourceType::NONE))); |
193 } | 193 } |
194 | 194 |
195 EXPECT_EQ(test_case.expected_request_type, | 195 EXPECT_EQ(test_case.expected_request_type, |
196 GetDataReductionProxyRequestType( | 196 GetDataReductionProxyRequestType( |
197 *request, data_reduction_proxy_config, | 197 *request, data_reduction_proxy_config, |
198 *test_context->config())); | 198 *test_context->config())); |
199 } | 199 } |
200 } | 200 } |
201 | 201 |
202 } // namespace data_reduction_proxy | 202 } // namespace data_reduction_proxy |
OLD | NEW |