Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc

Issue 863203009: Store Proxy Servers as proxy servers and not GURLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
index 68eedfe6ec85027148e757d0a8feff1ed9f05c99..e20faff7984c1093f923cef2fd41a3afc0db12a5 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
@@ -17,7 +17,6 @@
#include "net/base/host_port_pair.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "url/gurl.h"
namespace {
const char kChromeProxyHeader[] = "chrome-proxy";
@@ -181,19 +180,16 @@ TEST_F(DataReductionProxyAuthRequestHandlerTest, AuthorizationOnIOThread) {
// Don't write headers with a valid data reduction ssl proxy.
auth_handler.MaybeAddRequestHeader(
NULL,
- net::ProxyServer::FromURI(
- net::HostPortPair::FromURL(
- GURL(params->DefaultSSLOrigin())).ToString(),
- net::ProxyServer::SCHEME_HTTP),
+ net::ProxyServer::FromURI(params->DefaultSSLOrigin(),
bengr 2015/02/04 00:49:25 #include "net/proxy/proxy_server.h"
tbansal1 2015/02/04 22:49:10 Done.
+ net::ProxyServer::SCHEME_HTTP),
&headers);
EXPECT_FALSE(headers.HasHeader(kChromeProxyHeader));
// Write headers with a valid data reduction proxy.
auth_handler.MaybeAddRequestHeader(
NULL,
- net::ProxyServer::FromURI(
- net::HostPortPair::FromURL(GURL(params->DefaultOrigin())).ToString(),
- net::ProxyServer::SCHEME_HTTP),
+ net::ProxyServer::FromURI(params->DefaultOrigin(),
+ net::ProxyServer::SCHEME_HTTP),
&headers);
EXPECT_TRUE(headers.HasHeader(kChromeProxyHeader));
std::string header_value;
@@ -203,7 +199,9 @@ TEST_F(DataReductionProxyAuthRequestHandlerTest, AuthorizationOnIOThread) {
// Write headers with a valid data reduction ssl proxy when one is expected.
net::HttpRequestHeaders ssl_headers;
auth_handler.MaybeAddProxyTunnelRequestHandler(
- net::HostPortPair::FromURL(GURL(params->DefaultSSLOrigin())),
+ net::ProxyServer::FromURI(
+ params->DefaultSSLOrigin(),
+ net::ProxyServer::SCHEME_HTTP).host_port_pair(),
&ssl_headers);
EXPECT_TRUE(ssl_headers.HasHeader(kChromeProxyHeader));
std::string ssl_header_value;
@@ -216,9 +214,8 @@ TEST_F(DataReductionProxyAuthRequestHandlerTest, AuthorizationOnIOThread) {
// Write headers with a valid data reduction proxy.
auth_handler.MaybeAddRequestHeader(
NULL,
- net::ProxyServer::FromURI(
- net::HostPortPair::FromURL(GURL(params->DefaultOrigin())).ToString(),
- net::ProxyServer::SCHEME_HTTP),
+ net::ProxyServer::FromURI(params->DefaultOrigin(),
+ net::ProxyServer::SCHEME_HTTP),
&headers2);
EXPECT_TRUE(headers2.HasHeader(kChromeProxyHeader));
std::string header_value2;
@@ -231,9 +228,8 @@ TEST_F(DataReductionProxyAuthRequestHandlerTest, AuthorizationOnIOThread) {
// Write headers with a valid data reduction proxy.
auth_handler.MaybeAddRequestHeader(
NULL,
- net::ProxyServer::FromURI(
- net::HostPortPair::FromURL(GURL(params->DefaultOrigin())).ToString(),
- net::ProxyServer::SCHEME_HTTP),
+ net::ProxyServer::FromURI(params->DefaultOrigin(),
+ net::ProxyServer::SCHEME_HTTP),
&headers3);
EXPECT_TRUE(headers3.HasHeader(kChromeProxyHeader));
std::string header_value3;
@@ -304,7 +300,7 @@ TEST_F(DataReductionProxyAuthRequestHandlerTest, AuthorizationBogusVersion) {
auth_handler.MaybeAddRequestHeader(
NULL,
net::ProxyServer::FromURI(
- net::HostPortPair::FromURL(GURL(params->DefaultOrigin())).ToString(),
+ params->DefaultOrigin(),
net::ProxyServer::SCHEME_HTTP),
&headers);
EXPECT_TRUE(headers.HasHeader(kChromeProxyHeader));

Powered by Google App Engine
This is Rietveld 408576698