commit d8fc4720c06d9e57d5fd98d6d6b723fffddbe159
author bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 13 13:17:15 2014
committer bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 13 13:17:15 2014
tree 665d9568104f3bfe1330e7d7b567cbe8c5d003d3
parent a2d6ed8e40f2747490558f311c438fa0245d262a

Moved data reduction proxy bypass logic to a NetworkDelegate

BUG=367221

Review URL: https://codereview.chromium.org/286903018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277009 0039d316-1c4b-4281-b951-d872f2087c98

net/url_request/url_request_unittest.cc

diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 851dc4b5..42a0835 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1863,6 +1863,8 @@
 
   // Check we see a failed request.
   EXPECT_FALSE(req.status().is_success());
+  // The proxy server is not set before failure.
+  EXPECT_TRUE(req.proxy_server().IsEmpty());
   EXPECT_EQ(URLRequestStatus::FAILED, req.status().status());
   EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, req.status().error());
 
@@ -2737,6 +2739,8 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+    // The proxy server is not set before failure.
+    EXPECT_TRUE(r.proxy_server().IsEmpty());
     EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r.status().error());
     EXPECT_EQ(1, d.response_started_count());
     // We should not have followed the redirect.
@@ -2763,6 +2767,8 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+    // The proxy server is not set before failure.
+    EXPECT_TRUE(r.proxy_server().IsEmpty());
     EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r.status().error());
     EXPECT_EQ(1, d.response_started_count());
     // We should not have followed the redirect.
@@ -2837,6 +2843,8 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+    // The proxy server is not set before cancellation.
+    EXPECT_TRUE(r.proxy_server().IsEmpty());
     EXPECT_EQ(ERR_EMPTY_RESPONSE, r.status().error());
     EXPECT_EQ(1, network_delegate.created_requests());
     EXPECT_EQ(0, network_delegate.destroyed_requests());
@@ -2867,6 +2875,8 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+    // The proxy server is not set before cancellation.
+    EXPECT_TRUE(r.proxy_server().IsEmpty());
     EXPECT_EQ(ERR_BLOCKED_BY_CLIENT, r.status().error());
     EXPECT_EQ(1, network_delegate.created_requests());
     EXPECT_EQ(0, network_delegate.destroyed_requests());
@@ -2943,6 +2953,7 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status());
+    EXPECT_TRUE(r.proxy_server().Equals(test_server_.host_port_pair()));
     EXPECT_EQ(0, r.status().error());
     EXPECT_EQ(redirect_url, r.url());
     EXPECT_EQ(original_url, r.original_url());
@@ -2975,6 +2986,7 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status());
+    EXPECT_TRUE(r.proxy_server().Equals(test_server_.host_port_pair()));
     EXPECT_EQ(0, r.status().error());
     EXPECT_EQ(redirect_url, r.url());
     EXPECT_EQ(original_url, r.original_url());
@@ -3050,6 +3062,7 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status());
+    EXPECT_TRUE(r.proxy_server().Equals(test_server_.host_port_pair()));
     EXPECT_EQ(net::OK, r.status().error());
     EXPECT_EQ(redirect_url, r.url());
     EXPECT_EQ(original_url, r.original_url());
@@ -3506,6 +3519,8 @@
     base::RunLoop().Run();
 
     EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+    // The proxy server is not set before failure.
+    EXPECT_TRUE(r.proxy_server().IsEmpty());
     EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, r.status().error());
   }
 }